gwj / at91sam9263 · Commits

Commit 80deece241098192470892c5aacbbc607226f454

Authored by blueswir1
1 parent 9e622b15

Sparse fixes: move ACPI table definitions to pc.h 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6738 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
@@ -54,9 +54,6 @@ @@ -54,9 +54,6 @@
54 54
55 #define MAX_IDE_BUS 2 55 #define MAX_IDE_BUS 2
56 56
57 -extern uint8_t *acpi_tables;  
58 -extern size_t acpi_tables_len;  
59 -  
60 static fdctrl_t *floppy_controller; 57 static fdctrl_t *floppy_controller;
61 static RTCState *rtc_state; 58 static RTCState *rtc_state;
62 static PITState *pit; 59 static PITState *pit;
@@ -443,7 +440,8 @@ static void bochs_bios_init(void) @@ -443,7 +440,8 @@ static void bochs_bios_init(void)
443 fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0); 440 fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0);
444 fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1); 441 fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1);
445 fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size); 442 fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
446 - fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES, acpi_tables, acpi_tables_len); 443 + fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES, (uint8_t *)acpi_tables,
  444 + acpi_tables_len);
447 } 445 }
448 446
449 /* Generate an initial boot sector which sets state and jump to 447 /* Generate an initial boot sector which sets state and jump to
@@ -101,6 +101,9 @@ int ioport_get_a20(void); @@ -101,6 +101,9 @@ int ioport_get_a20(void);
101 101
102 /* acpi.c */ 102 /* acpi.c */
103 extern int acpi_enabled; 103 extern int acpi_enabled;
  104 +extern char *acpi_tables;
  105 +extern size_t acpi_tables_len;
  106 +
104 i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, 107 i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
105 qemu_irq sci_irq); 108 qemu_irq sci_irq);
106 void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr); 109 void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);