Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 242b2287 authored by Aaron Lu's avatar Aaron Lu Committed by Rafael J. Wysocki
Browse files

ACPICA: expose OSI version 



Expose acpi_gbl_osi_data so that code outside of ACPICA can check
the value of the last successfull _OSI call.  The definitions for
OSI versions are moved to actypes.h so that other components can
access them too.

Based on a patch from Matthew Garrett which in turn was based on
an earlier patch from Seth Forshee.

[rjw: Changelog]
Signed-off-by: default avatarAaron Lu <aaron.lu@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ad81f054

drivers/acpi/acpica/aclocal.h

+0 −13
Original line number Diff line number Diff line
@@ -931,19 +931,6 @@ struct acpi_bit_register_info { 


/* Structs and definitions for _OSI support and I/O port validation */



#define ACPI_OSI_WIN_2000               0x01

#define ACPI_OSI_WIN_XP                 0x02

#define ACPI_OSI_WIN_XP_SP1             0x03

#define ACPI_OSI_WINSRV_2003            0x04

#define ACPI_OSI_WIN_XP_SP2             0x05

#define ACPI_OSI_WINSRV_2003_SP1        0x06

#define ACPI_OSI_WIN_VISTA              0x07

#define ACPI_OSI_WINSRV_2008            0x08

#define ACPI_OSI_WIN_VISTA_SP1          0x09

#define ACPI_OSI_WIN_VISTA_SP2          0x0A

#define ACPI_OSI_WIN_7                  0x0B

#define ACPI_OSI_WIN_8                  0x0C



#define ACPI_ALWAYS_ILLEGAL             0x00



struct acpi_interface_info {

include/acpi/acpixf.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ extern u32 acpi_current_gpe_count; 
extern struct acpi_table_fadt acpi_gbl_FADT;

extern u8 acpi_gbl_system_awake_and_running;

extern u8 acpi_gbl_reduced_hardware;	/* ACPI 5.0 */

extern u8 acpi_gbl_osi_data;



/* Runtime configuration of debug print levels */

include/acpi/actypes.h

+15 −0
Original line number Diff line number Diff line
@@ -1144,4 +1144,19 @@ struct acpi_memory_list { 
#endif

};



/* Definitions for _OSI support */



#define ACPI_OSI_WIN_2000               0x01

#define ACPI_OSI_WIN_XP                 0x02

#define ACPI_OSI_WIN_XP_SP1             0x03

#define ACPI_OSI_WINSRV_2003            0x04

#define ACPI_OSI_WIN_XP_SP2             0x05

#define ACPI_OSI_WINSRV_2003_SP1        0x06

#define ACPI_OSI_WIN_VISTA              0x07

#define ACPI_OSI_WINSRV_2008            0x08

#define ACPI_OSI_WIN_VISTA_SP1          0x09

#define ACPI_OSI_WIN_VISTA_SP2          0x0A

#define ACPI_OSI_WIN_7                  0x0B

#define ACPI_OSI_WIN_8                  0x0C



#endif				/* __ACTYPES_H__ */