OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pc: export applesmc IO port/len 

IO port and length will be used in following patch
to correctly generate SMC ACPI device in SSDT.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2015-02-20 18:22:11 +00:00 committed by Michael S. Tsirkin
parent 7056045332
commit 1142e45ffd
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/i386/acpi-build.c
View File

@ -145,7 +145,7 @@ static void acpi_get_dsdt(AcpiMiscInfo *info)
/* Patch in appropriate value for AppleSMC _STA */ /* Patch in appropriate value for AppleSMC _STA */
*(uint8_t *)(info->dsdt_code + *applesmc_sta) = *(uint8_t *)(info->dsdt_code + *applesmc_sta) =
applesmc_find() ? 0x0b : 0x00; applesmc_port() ? 0x0b : 0x00;
} }
static static

5
hw/misc/applesmc.c
View File

@ -43,7 +43,6 @@
/* command/status port used by Apple SMC */ /* command/status port used by Apple SMC */
#define APPLESMC_CMD_PORT 0x4 #define APPLESMC_CMD_PORT 0x4
#define APPLESMC_NR_PORTS 32 #define APPLESMC_NR_PORTS 32
#define APPLESMC_MAX_DATA_LENGTH 32
#define APPLESMC_READ_CMD 0x10 #define APPLESMC_READ_CMD 0x10
#define APPLESMC_WRITE_CMD 0x11 #define APPLESMC_WRITE_CMD 0x11
@ -249,8 +248,8 @@ static void applesmc_isa_realize(DeviceState *dev, Error **errp)
} }
static Property applesmc_isa_properties[] = { static Property applesmc_isa_properties[] = {
DEFINE_PROP_UINT32("iobase", AppleSMCState, iobase, DEFINE_PROP_UINT32(APPLESMC_PROP_IO_BASE, AppleSMCState, iobase,
APPLESMC_DEFAULT_IOBASE), APPLESMC_DEFAULT_IOBASE),
DEFINE_PROP_STRING("osk", AppleSMCState, osk), DEFINE_PROP_STRING("osk", AppleSMCState, osk),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

11
include/hw/isa/isa.h
View File

@ -21,10 +21,17 @@
#define ISA_BUS(obj) OBJECT_CHECK(ISABus, (obj), TYPE_ISA_BUS) #define ISA_BUS(obj) OBJECT_CHECK(ISABus, (obj), TYPE_ISA_BUS)
#define TYPE_APPLE_SMC "isa-applesmc" #define TYPE_APPLE_SMC "isa-applesmc"
#define APPLESMC_MAX_DATA_LENGTH 32
#define APPLESMC_PROP_IO_BASE "iobase"
static inline bool applesmc_find(void) static inline uint16_t applesmc_port(void)
{ {
return object_resolve_path_type("", TYPE_APPLE_SMC, NULL); Object *obj = object_resolve_path_type("", TYPE_APPLE_SMC, NULL);
if (obj) {
return object_property_get_int(obj, APPLESMC_PROP_IO_BASE, NULL);
}
return 0;
} }
typedef struct ISADeviceClass { typedef struct ISADeviceClass {