Skip to content

L
linux
Commit c6f1cfe6 authored by Len Brown's avatar Len Brown
Browse files
Options

Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.1 

into intel.com:/home/lenb/src/linux-acpi-test-2.6.2
parents db692956 9cbe400a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 184 deletions
drivers/acpi/dispatcher/dsfield.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/dispatcher/dsinit.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/dispatcher/dsmethod.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/dispatcher/dsmthdat.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -601,7 +601,6 @@ acpi_ds_store_object_to_local ( ...@@ -601,7 +601,6 @@ acpi_ds_store_object_to_local (
new_obj_desc = obj_desc; new_obj_desc = obj_desc;
if (obj_desc->common.reference_count > 1) { if (obj_desc->common.reference_count > 1) {
status = acpi_ut_copy_iobject_to_iobject (obj_desc, &new_obj_desc, walk_state); status = acpi_ut_copy_iobject_to_iobject (obj_desc, &new_obj_desc, walk_state);
new_obj_desc;
if (ACPI_FAILURE (status)) { if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status); return_ACPI_STATUS (status);
} }
......
drivers/acpi/dispatcher/dsobject.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/dispatcher/dsopcode.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/dispatcher/dsutils.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/dispatcher/dswexec.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/dispatcher/dswload.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/dispatcher/dswscope.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/dispatcher/dswstate.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/events/evevent.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/events/evgpe.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/events/evgpeblk.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/events/evmisc.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/events/evregion.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#define ACPI_NUM_DEFAULT_SPACES 4 #define ACPI_NUM_DEFAULT_SPACES 4
u8 acpi_gbl_default_address_spaces[ACPI_NUM_DEFAULT_SPACES] = { static u8 acpi_gbl_default_address_spaces[ACPI_NUM_DEFAULT_SPACES] = {
ACPI_ADR_SPACE_SYSTEM_MEMORY, ACPI_ADR_SPACE_SYSTEM_MEMORY,
ACPI_ADR_SPACE_SYSTEM_IO, ACPI_ADR_SPACE_SYSTEM_IO,
ACPI_ADR_SPACE_PCI_CONFIG, ACPI_ADR_SPACE_PCI_CONFIG,
...@@ -699,9 +699,6 @@ acpi_ev_reg_run ( ...@@ -699,9 +699,6 @@ acpi_ev_reg_run (
acpi_status status; acpi_status status;
ACPI_FUNCTION_NAME ("ev_reg_run");
handler_obj = (union acpi_operand_object *) context; handler_obj = (union acpi_operand_object *) context;
/* Parameter validation */ /* Parameter validation */
......
drivers/acpi/events/evrgnini.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/events/evsci.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/events/evxface.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/events/evxfevnt.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/events/evxfregn.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exconfig.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exconvrt.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/excreate.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exdump.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exfield.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exfldio.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exmisc.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exmutex.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exnames.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exoparg1.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exoparg2.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exoparg3.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exoparg6.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exprep.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exregion.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exresnte.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exresolv.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exresop.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exstore.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exstoren.c
View file @ c6f1cfe6
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exstorob.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exsystem.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/executer/exutils.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/hardware/hwacpi.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/hardware/hwgpe.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -348,17 +348,14 @@ acpi_hw_disable_gpe_block ( ...@@ -348,17 +348,14 @@ acpi_hw_disable_gpe_block (
struct acpi_gpe_block_info *gpe_block) struct acpi_gpe_block_info *gpe_block)
{ {
u32 i; u32 i;
struct acpi_gpe_register_info *gpe_register_info;
acpi_status status; acpi_status status;
/* Get the register info for the entire GPE block */
gpe_register_info = gpe_block->register_info;
/* Examine each GPE Register within the block */ /* Examine each GPE Register within the block */
for (i = 0; i < gpe_block->register_count; i++) { for (i = 0; i < gpe_block->register_count; i++) {
/* Disable all GPEs in this register */
status = acpi_hw_low_level_write (8, 0x00, status = acpi_hw_low_level_write (8, 0x00,
&gpe_block->register_info[i].enable_address); &gpe_block->register_info[i].enable_address);
if (ACPI_FAILURE (status)) { if (ACPI_FAILURE (status)) {
...@@ -389,17 +386,14 @@ acpi_hw_clear_gpe_block ( ...@@ -389,17 +386,14 @@ acpi_hw_clear_gpe_block (
struct acpi_gpe_block_info *gpe_block) struct acpi_gpe_block_info *gpe_block)
{ {
u32 i; u32 i;
struct acpi_gpe_register_info *gpe_register_info;
acpi_status status; acpi_status status;
/* Get the register info for the entire GPE block */
gpe_register_info = gpe_block->register_info;
/* Examine each GPE Register within the block */ /* Examine each GPE Register within the block */
for (i = 0; i < gpe_block->register_count; i++) { for (i = 0; i < gpe_block->register_count; i++) {
/* Clear all GPEs in this register */
status = acpi_hw_low_level_write (8, 0xFF, status = acpi_hw_low_level_write (8, 0xFF,
&gpe_block->register_info[i].status_address); &gpe_block->register_info[i].status_address);
if (ACPI_FAILURE (status)) { if (ACPI_FAILURE (status)) {
......
drivers/acpi/hardware/hwregs.c
View file @ c6f1cfe6
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/hardware/hwsleep.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -251,7 +251,7 @@ acpi_enter_sleep_state ( ...@@ -251,7 +251,7 @@ acpi_enter_sleep_state (
} }
} }
status = acpi_hw_disable_non_wakeup_gpes(); status = acpi_hw_disable_non_wakeup_gpes ();
if (ACPI_FAILURE (status)) { if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status); return_ACPI_STATUS (status);
} }
...@@ -274,6 +274,11 @@ acpi_enter_sleep_state ( ...@@ -274,6 +274,11 @@ acpi_enter_sleep_state (
PM1Acontrol |= (acpi_gbl_sleep_type_a << sleep_type_reg_info->bit_position); PM1Acontrol |= (acpi_gbl_sleep_type_a << sleep_type_reg_info->bit_position);
PM1Bcontrol |= (acpi_gbl_sleep_type_b << sleep_type_reg_info->bit_position); PM1Bcontrol |= (acpi_gbl_sleep_type_b << sleep_type_reg_info->bit_position);
/*
* We split the writes of SLP_TYP and SLP_EN to workaround
* poorly implemented hardware.
*/
/* Write #1: fill in SLP_TYP data */ /* Write #1: fill in SLP_TYP data */
status = acpi_hw_register_write (ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1A_CONTROL, PM1Acontrol); status = acpi_hw_register_write (ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1A_CONTROL, PM1Acontrol);
...@@ -313,7 +318,7 @@ acpi_enter_sleep_state ( ...@@ -313,7 +318,7 @@ acpi_enter_sleep_state (
* Wait ten seconds, then try again. This is to get S4/S5 to work on all machines. * Wait ten seconds, then try again. This is to get S4/S5 to work on all machines.
* *
* We wait so long to allow chipsets that poll this reg very slowly to * We wait so long to allow chipsets that poll this reg very slowly to
* still read the right value. Ideally, this entire block would go * still read the right value. Ideally, this block would go
* away entirely. * away entirely.
*/ */
acpi_os_stall (10000000); acpi_os_stall (10000000);
...@@ -365,12 +370,22 @@ acpi_enter_sleep_state_s4bios ( ...@@ -365,12 +370,22 @@ acpi_enter_sleep_state_s4bios (
ACPI_FUNCTION_TRACE ("acpi_enter_sleep_state_s4bios"); ACPI_FUNCTION_TRACE ("acpi_enter_sleep_state_s4bios");
acpi_set_register (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK); status = acpi_set_register (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK);
acpi_hw_clear_acpi_status(ACPI_MTX_DO_NOT_LOCK); if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status);
}
status = acpi_hw_clear_acpi_status (ACPI_MTX_DO_NOT_LOCK);
if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status);
}
acpi_hw_disable_non_wakeup_gpes(); status = acpi_hw_disable_non_wakeup_gpes ();
if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status);
}
ACPI_FLUSH_CPU_CACHE(); ACPI_FLUSH_CPU_CACHE ();
status = acpi_os_write_port (acpi_gbl_FADT->smi_cmd, (u32) acpi_gbl_FADT->S4bios_req, 8); status = acpi_os_write_port (acpi_gbl_FADT->smi_cmd, (u32) acpi_gbl_FADT->S4bios_req, 8);
...@@ -407,30 +422,47 @@ acpi_leave_sleep_state ( ...@@ -407,30 +422,47 @@ acpi_leave_sleep_state (
acpi_status status; acpi_status status;
struct acpi_bit_register_info *sleep_type_reg_info; struct acpi_bit_register_info *sleep_type_reg_info;
struct acpi_bit_register_info *sleep_enable_reg_info; struct acpi_bit_register_info *sleep_enable_reg_info;
u32 pm1x_control; u32 PM1Acontrol;
u32 PM1Bcontrol;
ACPI_FUNCTION_TRACE ("acpi_leave_sleep_state"); ACPI_FUNCTION_TRACE ("acpi_leave_sleep_state");
/* Some machines require SLP_TYPE and SLP_EN to be cleared */
sleep_type_reg_info = acpi_hw_get_bit_register_info (ACPI_BITREG_SLEEP_TYPE_A); /*
sleep_enable_reg_info = acpi_hw_get_bit_register_info (ACPI_BITREG_SLEEP_ENABLE); * Set SLP_TYPE and SLP_EN to state S0.
* This is unclear from the ACPI Spec, but it is required
* by some machines.
*/
status = acpi_get_sleep_type_data (ACPI_STATE_S0,
&acpi_gbl_sleep_type_a, &acpi_gbl_sleep_type_b);
if (ACPI_SUCCESS (status)) {
sleep_type_reg_info = acpi_hw_get_bit_register_info (ACPI_BITREG_SLEEP_TYPE_A);
sleep_enable_reg_info = acpi_hw_get_bit_register_info (ACPI_BITREG_SLEEP_ENABLE);
/* Get current value of PM1A control */ /* Get current value of PM1A control */
status = acpi_hw_register_read (ACPI_MTX_DO_NOT_LOCK, status = acpi_hw_register_read (ACPI_MTX_DO_NOT_LOCK,
ACPI_REGISTER_PM1_CONTROL, &pm1x_control); ACPI_REGISTER_PM1_CONTROL, &PM1Acontrol);
if (ACPI_SUCCESS (status)) { if (ACPI_SUCCESS (status)) {
/* Clear SLP_TYP and SLP_EN */ /* Clear SLP_EN and SLP_TYP fields */
PM1Acontrol &= ~(sleep_type_reg_info->access_bit_mask |
sleep_enable_reg_info->access_bit_mask);
PM1Bcontrol = PM1Acontrol;
pm1x_control &= ~(sleep_type_reg_info->access_bit_mask | /* Insert SLP_TYP bits */
sleep_enable_reg_info->access_bit_mask);
acpi_hw_register_write (ACPI_MTX_DO_NOT_LOCK, PM1Acontrol |= (acpi_gbl_sleep_type_a << sleep_type_reg_info->bit_position);
ACPI_REGISTER_PM1A_CONTROL, pm1x_control); PM1Bcontrol |= (acpi_gbl_sleep_type_b << sleep_type_reg_info->bit_position);
acpi_hw_register_write (ACPI_MTX_DO_NOT_LOCK,
ACPI_REGISTER_PM1B_CONTROL, pm1x_control); /* Just ignore any errors */
(void) acpi_hw_register_write (ACPI_MTX_DO_NOT_LOCK,
ACPI_REGISTER_PM1A_CONTROL, PM1Acontrol);
(void) acpi_hw_register_write (ACPI_MTX_DO_NOT_LOCK,
ACPI_REGISTER_PM1B_CONTROL, PM1Bcontrol);
}
} }
/* Ensure enter_sleep_state_prep -> enter_sleep_state ordering */ /* Ensure enter_sleep_state_prep -> enter_sleep_state ordering */
...@@ -464,7 +496,7 @@ acpi_leave_sleep_state ( ...@@ -464,7 +496,7 @@ acpi_leave_sleep_state (
/* _WAK returns stuff - do we want to look at it? */ /* _WAK returns stuff - do we want to look at it? */
status = acpi_hw_enable_non_wakeup_gpes(); status = acpi_hw_enable_non_wakeup_gpes ();
if (ACPI_FAILURE (status)) { if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status); return_ACPI_STATUS (status);
} }
......
drivers/acpi/hardware/hwtimer.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nsaccess.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nsalloc.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nsdump.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nsdumpdv.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nseval.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nsinit.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nsload.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nsnames.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nsobject.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nsparse.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nssearch.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nsutils.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nswalk.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nsxfeval.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nsxfname.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/namespace/nsxfobj.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/parser/psargs.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/parser/psopcode.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/parser/psparse.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/parser/psscope.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/parser/pstree.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/parser/psutils.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/parser/pswalk.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/parser/psxface.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/resources/rsaddr.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/resources/rscalc.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/resources/rscreate.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/resources/rsdump.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/resources/rsio.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/resources/rsirq.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/resources/rslist.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/resources/rsmemory.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/resources/rsmisc.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/resources/rsutils.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/resources/rsxface.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/tables/tbconvrt.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -138,11 +138,11 @@ acpi_tb_convert_to_xsdt ( ...@@ -138,11 +138,11 @@ acpi_tb_convert_to_xsdt (
for (i = 0; i < acpi_gbl_rsdt_table_count; i++) { for (i = 0; i < acpi_gbl_rsdt_table_count; i++) {
if (acpi_gbl_RSDP->revision < 2) { if (acpi_gbl_RSDP->revision < 2) {
ACPI_STORE_ADDRESS (new_table->table_offset_entry[i], ACPI_STORE_ADDRESS (new_table->table_offset_entry[i],
((struct rsdt_descriptor_rev1 *) table_info->pointer)->table_offset_entry[i]); (ACPI_CAST_PTR (struct rsdt_descriptor_rev1, table_info->pointer))->table_offset_entry[i]);
} }
else { else {
new_table->table_offset_entry[i] = new_table->table_offset_entry[i] =
((XSDT_DESCRIPTOR *) table_info->pointer)->table_offset_entry[i]; (ACPI_CAST_PTR (XSDT_DESCRIPTOR, table_info->pointer))->table_offset_entry[i];
} }
} }
...@@ -152,7 +152,7 @@ acpi_tb_convert_to_xsdt ( ...@@ -152,7 +152,7 @@ acpi_tb_convert_to_xsdt (
/* Point the table descriptor to the new table */ /* Point the table descriptor to the new table */
table_info->pointer = (struct acpi_table_header *) new_table; table_info->pointer = ACPI_CAST_PTR (struct acpi_table_header, new_table);
table_info->length = table_size; table_info->length = table_size;
table_info->allocation = ACPI_MEM_ALLOCATED; table_info->allocation = ACPI_MEM_ALLOCATED;
...@@ -469,7 +469,7 @@ acpi_tb_convert_table_fadt (void) ...@@ -469,7 +469,7 @@ acpi_tb_convert_table_fadt (void)
/* Install the new table */ /* Install the new table */
table_desc->pointer = (struct acpi_table_header *) acpi_gbl_FADT; table_desc->pointer = ACPI_CAST_PTR (struct acpi_table_header, acpi_gbl_FADT);
table_desc->allocation = ACPI_MEM_ALLOCATED; table_desc->allocation = ACPI_MEM_ALLOCATED;
table_desc->length = sizeof (struct fadt_descriptor_rev2); table_desc->length = sizeof (struct fadt_descriptor_rev2);
......
drivers/acpi/tables/tbget.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/tables/tbgetall.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/tables/tbinstal.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/tables/tbrsdt.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -233,6 +233,15 @@ acpi_tb_validate_rsdt ( ...@@ -233,6 +233,15 @@ acpi_tb_validate_rsdt (
acpi_gbl_RSDP->rsdt_physical_address, acpi_gbl_RSDP->rsdt_physical_address,
(void *) (acpi_native_uint) acpi_gbl_RSDP->rsdt_physical_address)); (void *) (acpi_native_uint) acpi_gbl_RSDP->rsdt_physical_address));
if (acpi_gbl_RSDP->revision < 2) {
ACPI_REPORT_ERROR (("Looking for RSDT (RSDP->Rev < 2)\n"))
}
else {
ACPI_REPORT_ERROR (("Looking for XSDT (RSDP->Rev >= 2)\n"))
}
ACPI_DUMP_BUFFER ((char *) table_ptr, 48);
return (AE_BAD_SIGNATURE); return (AE_BAD_SIGNATURE);
} }
...@@ -305,7 +314,7 @@ acpi_tb_get_table_rsdt ( ...@@ -305,7 +314,7 @@ acpi_tb_get_table_rsdt (
return_ACPI_STATUS (status); return_ACPI_STATUS (status);
} }
acpi_gbl_XSDT = (XSDT_DESCRIPTOR *) table_info.pointer; acpi_gbl_XSDT = ACPI_CAST_PTR (XSDT_DESCRIPTOR, table_info.pointer);
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "XSDT located at %p\n", acpi_gbl_XSDT)); ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "XSDT located at %p\n", acpi_gbl_XSDT));
return_ACPI_STATUS (status); return_ACPI_STATUS (status);
......
drivers/acpi/tables/tbutils.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/tables/tbxface.c
View file @ c6f1cfe6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/tables/tbxfroot.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -241,11 +241,11 @@ acpi_get_firmware_table ( ...@@ -241,11 +241,11 @@ acpi_get_firmware_table (
/* Get the next table pointer, handle RSDT vs. XSDT */ /* Get the next table pointer, handle RSDT vs. XSDT */
if (acpi_gbl_RSDP->revision < 2) { if (acpi_gbl_RSDP->revision < 2) {
address.pointer.value = ((RSDT_DESCRIPTOR *) rsdt_info.pointer)->table_offset_entry[i]; address.pointer.value = (ACPI_CAST_PTR (RSDT_DESCRIPTOR, rsdt_info.pointer))->table_offset_entry[i];
} }
else { else {
address.pointer.value = address.pointer.value =
((XSDT_DESCRIPTOR *) rsdt_info.pointer)->table_offset_entry[i]; (ACPI_CAST_PTR (XSDT_DESCRIPTOR, rsdt_info.pointer))->table_offset_entry[i];
} }
/* Get the table header */ /* Get the table header */
......
drivers/acpi/utilities/utalloc.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/utilities/utcopy.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/utilities/utdebug.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/utilities/utdelete.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/utilities/uteval.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/utilities/utglobal.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/utilities/utinit.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*****************************************************************************/ *****************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/utilities/utmath.c
View file @ c6f1cfe6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (C) 2000 - 2003, R. Byron Moore * Copyright (C) 2000 - 2004, R. Byron Moore
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
drivers/acpi/utilities/utmisc.c
View file @ c6f1cfe6
This diff is collapsed.
drivers/acpi/utilities/utobject.c
View file @ c6f1cfe6
This diff is collapsed.
drivers/acpi/utilities/utxface.c
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acconfig.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acdebug.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acdisasm.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acdispat.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acevents.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acexcep.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acglobal.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/achware.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acinterp.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/aclocal.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acmacros.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acnamesp.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acobject.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acoutput.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acparser.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acpi.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acpiosxf.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acpixf.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acresrc.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acstruct.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/actables.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/actbl.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/actbl1.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/actbl2.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/actypes.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/acutils.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/amlcode.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/amlresrc.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/platform/acenv.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/platform/acgcc.h
View file @ c6f1cfe6
This diff is collapsed.
include/acpi/platform/aclinux.h
View file @ c6f1cfe6
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7