Commit b1d8e52e636fd2c137e5abb2d59b331473e0930d
1 parent
51a0f568
Fix undeclared symbol warnings from sparse
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5539 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
37 changed files
with
71 additions
and
61 deletions
audio/sdlaudio.c
block-vmdk.c
| @@ -322,7 +322,7 @@ static void vmdk_parent_close(BlockDriverState *bs) | @@ -322,7 +322,7 @@ static void vmdk_parent_close(BlockDriverState *bs) | ||
| 322 | bdrv_close(bs->backing_hd); | 322 | bdrv_close(bs->backing_hd); |
| 323 | } | 323 | } |
| 324 | 324 | ||
| 325 | -int parent_open = 0; | 325 | +static int parent_open = 0; |
| 326 | static int vmdk_parent_open(BlockDriverState *bs, const char * filename) | 326 | static int vmdk_parent_open(BlockDriverState *bs, const char * filename) |
| 327 | { | 327 | { |
| 328 | BDRVVmdkState *s = bs->opaque; | 328 | BDRVVmdkState *s = bs->opaque; |
feature_to_c.sh
| @@ -65,6 +65,7 @@ for input; do | @@ -65,6 +65,7 @@ for input; do | ||
| 65 | done | 65 | done |
| 66 | 66 | ||
| 67 | echo >> $output | 67 | echo >> $output |
| 68 | +echo "extern const char *const xml_builtin[][2];" >> $output | ||
| 68 | echo "const char *const xml_builtin[][2] = {" >> $output | 69 | echo "const char *const xml_builtin[][2] = {" >> $output |
| 69 | 70 | ||
| 70 | for input; do | 71 | for input; do |
fpu/softfloat-specialize.h
| @@ -37,12 +37,6 @@ these four paragraphs for those parts of this code that are retained. | @@ -37,12 +37,6 @@ these four paragraphs for those parts of this code that are retained. | ||
| 37 | #endif | 37 | #endif |
| 38 | 38 | ||
| 39 | /*---------------------------------------------------------------------------- | 39 | /*---------------------------------------------------------------------------- |
| 40 | -| Underflow tininess-detection mode, statically initialized to default value. | ||
| 41 | -| (The declaration in `softfloat.h' must match the `int8' type here.) | ||
| 42 | -*----------------------------------------------------------------------------*/ | ||
| 43 | -int8 float_detect_tininess = float_tininess_after_rounding; | ||
| 44 | - | ||
| 45 | -/*---------------------------------------------------------------------------- | ||
| 46 | | Raises the exceptions specified by `flags'. Floating-point traps can be | 40 | | Raises the exceptions specified by `flags'. Floating-point traps can be |
| 47 | | defined here if desired. It is currently not possible for such a trap | 41 | | defined here if desired. It is currently not possible for such a trap |
| 48 | | to substitute a result value. If traps are not implemented, this routine | 42 | | to substitute a result value. If traps are not implemented, this routine |
hw/bt-hci.c
| @@ -87,6 +87,7 @@ struct bt_hci_link_s { | @@ -87,6 +87,7 @@ struct bt_hci_link_s { | ||
| 87 | }; | 87 | }; |
| 88 | 88 | ||
| 89 | /* LMP layer emulation */ | 89 | /* LMP layer emulation */ |
| 90 | +#if 0 | ||
| 90 | static void bt_submit_lmp(struct bt_device_s *bt, int length, uint8_t *data) | 91 | static void bt_submit_lmp(struct bt_device_s *bt, int length, uint8_t *data) |
| 91 | { | 92 | { |
| 92 | int resp, resplen, error, op, tr; | 93 | int resp, resplen, error, op, tr; |
| @@ -386,7 +387,7 @@ static void bt_submit_lmp(struct bt_device_s *bt, int length, uint8_t *data) | @@ -386,7 +387,7 @@ static void bt_submit_lmp(struct bt_device_s *bt, int length, uint8_t *data) | ||
| 386 | respdata[0] |= tr; | 387 | respdata[0] |= tr; |
| 387 | } | 388 | } |
| 388 | 389 | ||
| 389 | -void bt_submit_raw_acl(struct bt_piconet_s *net, int length, uint8_t *data) | 390 | +static void bt_submit_raw_acl(struct bt_piconet_s *net, int length, uint8_t *data) |
| 390 | { | 391 | { |
| 391 | struct bt_device_s *slave; | 392 | struct bt_device_s *slave; |
| 392 | if (length < 1) | 393 | if (length < 1) |
| @@ -411,6 +412,7 @@ void bt_submit_raw_acl(struct bt_piconet_s *net, int length, uint8_t *data) | @@ -411,6 +412,7 @@ void bt_submit_raw_acl(struct bt_piconet_s *net, int length, uint8_t *data) | ||
| 411 | break; | 412 | break; |
| 412 | } | 413 | } |
| 413 | } | 414 | } |
| 415 | +#endif | ||
| 414 | 416 | ||
| 415 | /* HCI layer emulation */ | 417 | /* HCI layer emulation */ |
| 416 | 418 | ||
| @@ -1118,7 +1120,7 @@ static void bt_hci_mode_tick(void *opaque) | @@ -1118,7 +1120,7 @@ static void bt_hci_mode_tick(void *opaque) | ||
| 1118 | bt_hci_lmp_mode_change_master(hci, link, acl_active, 0); | 1120 | bt_hci_lmp_mode_change_master(hci, link, acl_active, 0); |
| 1119 | } | 1121 | } |
| 1120 | 1122 | ||
| 1121 | -void bt_hci_reset(struct bt_hci_s *hci) | 1123 | +static void bt_hci_reset(struct bt_hci_s *hci) |
| 1122 | { | 1124 | { |
| 1123 | hci->acl_len = 0; | 1125 | hci->acl_len = 0; |
| 1124 | hci->last_cmd = 0; | 1126 | hci->last_cmd = 0; |
hw/cbus.c
| @@ -435,7 +435,8 @@ void retu_key_event(void *retu, int state) | @@ -435,7 +435,8 @@ void retu_key_event(void *retu, int state) | ||
| 435 | s->status |= 1 << 5; | 435 | s->status |= 1 << 5; |
| 436 | } | 436 | } |
| 437 | 437 | ||
| 438 | -void retu_head_event(void *retu, int state) | 438 | +#if 0 |
| 439 | +static void retu_head_event(void *retu, int state) | ||
| 439 | { | 440 | { |
| 440 | struct cbus_slave_s *slave = (struct cbus_slave_s *) retu; | 441 | struct cbus_slave_s *slave = (struct cbus_slave_s *) retu; |
| 441 | struct cbus_retu_s *s = (struct cbus_retu_s *) slave->opaque; | 442 | struct cbus_retu_s *s = (struct cbus_retu_s *) slave->opaque; |
| @@ -452,7 +453,7 @@ void retu_head_event(void *retu, int state) | @@ -452,7 +453,7 @@ void retu_head_event(void *retu, int state) | ||
| 452 | s->result[retu_adc_head_det] = 123; | 453 | s->result[retu_adc_head_det] = 123; |
| 453 | } | 454 | } |
| 454 | 455 | ||
| 455 | -void retu_hook_event(void *retu, int state) | 456 | +static void retu_hook_event(void *retu, int state) |
| 456 | { | 457 | { |
| 457 | struct cbus_slave_s *slave = (struct cbus_slave_s *) retu; | 458 | struct cbus_slave_s *slave = (struct cbus_slave_s *) retu; |
| 458 | struct cbus_retu_s *s = (struct cbus_retu_s *) slave->opaque; | 459 | struct cbus_retu_s *s = (struct cbus_retu_s *) slave->opaque; |
| @@ -468,6 +469,7 @@ void retu_hook_event(void *retu, int state) | @@ -468,6 +469,7 @@ void retu_hook_event(void *retu, int state) | ||
| 468 | else | 469 | else |
| 469 | s->result[retu_adc_hook_det] = 123; | 470 | s->result[retu_adc_hook_det] = 123; |
| 470 | } | 471 | } |
| 472 | +#endif | ||
| 471 | 473 | ||
| 472 | /* Tahvo/Betty */ | 474 | /* Tahvo/Betty */ |
| 473 | struct cbus_tahvo_s { | 475 | struct cbus_tahvo_s { |
hw/gt64xxx.c
| @@ -891,7 +891,6 @@ static int pci_gt64120_map_irq(PCIDevice *pci_dev, int irq_num) | @@ -891,7 +891,6 @@ static int pci_gt64120_map_irq(PCIDevice *pci_dev, int irq_num) | ||
| 891 | } | 891 | } |
| 892 | } | 892 | } |
| 893 | 893 | ||
| 894 | -extern PCIDevice *piix4_dev; | ||
| 895 | static int pci_irq_levels[4]; | 894 | static int pci_irq_levels[4]; |
| 896 | 895 | ||
| 897 | static void pci_gt64120_set_irq(qemu_irq *pic, int irq_num, int level) | 896 | static void pci_gt64120_set_irq(qemu_irq *pic, int irq_num, int level) |
hw/mst_fpga.c
| @@ -168,12 +168,12 @@ mst_fpga_writeb(void *opaque, target_phys_addr_t addr, uint32_t value) | @@ -168,12 +168,12 @@ mst_fpga_writeb(void *opaque, target_phys_addr_t addr, uint32_t value) | ||
| 168 | } | 168 | } |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | -CPUReadMemoryFunc *mst_fpga_readfn[] = { | 171 | +static CPUReadMemoryFunc *mst_fpga_readfn[] = { |
| 172 | mst_fpga_readb, | 172 | mst_fpga_readb, |
| 173 | mst_fpga_readb, | 173 | mst_fpga_readb, |
| 174 | mst_fpga_readb, | 174 | mst_fpga_readb, |
| 175 | }; | 175 | }; |
| 176 | -CPUWriteMemoryFunc *mst_fpga_writefn[] = { | 176 | +static CPUWriteMemoryFunc *mst_fpga_writefn[] = { |
| 177 | mst_fpga_writeb, | 177 | mst_fpga_writeb, |
| 178 | mst_fpga_writeb, | 178 | mst_fpga_writeb, |
| 179 | mst_fpga_writeb, | 179 | mst_fpga_writeb, |
hw/musicpal.c
| @@ -236,7 +236,7 @@ static i2c_interface *mixer_i2c; | @@ -236,7 +236,7 @@ static i2c_interface *mixer_i2c; | ||
| 236 | /* Wolfson 8750 I2C address */ | 236 | /* Wolfson 8750 I2C address */ |
| 237 | #define MP_WM_ADDR 0x34 | 237 | #define MP_WM_ADDR 0x34 |
| 238 | 238 | ||
| 239 | -const char audio_name[] = "mv88w8618"; | 239 | +static const char audio_name[] = "mv88w8618"; |
| 240 | 240 | ||
| 241 | typedef struct musicpal_audio_state { | 241 | typedef struct musicpal_audio_state { |
| 242 | uint32_t base; | 242 | uint32_t base; |
hw/nand.c
| @@ -106,7 +106,7 @@ struct nand_flash_s { | @@ -106,7 +106,7 @@ struct nand_flash_s { | ||
| 106 | # include "nand.c" | 106 | # include "nand.c" |
| 107 | 107 | ||
| 108 | /* Information based on Linux drivers/mtd/nand/nand_ids.c */ | 108 | /* Information based on Linux drivers/mtd/nand/nand_ids.c */ |
| 109 | -struct nand_info_s { | 109 | +static const struct nand_info_s { |
| 110 | int size; | 110 | int size; |
| 111 | int width; | 111 | int width; |
| 112 | int page_shift; | 112 | int page_shift; |
hw/omap2.c
| @@ -2174,7 +2174,7 @@ static CPUWriteMemoryFunc *omap_sti_fifo_writefn[] = { | @@ -2174,7 +2174,7 @@ static CPUWriteMemoryFunc *omap_sti_fifo_writefn[] = { | ||
| 2174 | omap_badwidth_write8, | 2174 | omap_badwidth_write8, |
| 2175 | }; | 2175 | }; |
| 2176 | 2176 | ||
| 2177 | -struct omap_sti_s *omap_sti_init(struct omap_target_agent_s *ta, | 2177 | +static struct omap_sti_s *omap_sti_init(struct omap_target_agent_s *ta, |
| 2178 | target_phys_addr_t channel_base, qemu_irq irq, omap_clk clk, | 2178 | target_phys_addr_t channel_base, qemu_irq irq, omap_clk clk, |
| 2179 | CharDriverState *chr) | 2179 | CharDriverState *chr) |
| 2180 | { | 2180 | { |
hw/omap_clk.c
| @@ -1101,7 +1101,7 @@ void omap_clk_adduser(struct clk *clk, qemu_irq user) | @@ -1101,7 +1101,7 @@ void omap_clk_adduser(struct clk *clk, qemu_irq user) | ||
| 1101 | 1101 | ||
| 1102 | /* If a clock is allowed to idle, it is disabled automatically when | 1102 | /* If a clock is allowed to idle, it is disabled automatically when |
| 1103 | * all of clock domains using it are disabled. */ | 1103 | * all of clock domains using it are disabled. */ |
| 1104 | -int omap_clk_is_idle(struct clk *clk) | 1104 | +static int omap_clk_is_idle(struct clk *clk) |
| 1105 | { | 1105 | { |
| 1106 | struct clk *chld; | 1106 | struct clk *chld; |
| 1107 | 1107 |
hw/openpic.c
| @@ -128,7 +128,7 @@ enum { | @@ -128,7 +128,7 @@ enum { | ||
| 128 | IRQ_INTERNAL = 0x02, | 128 | IRQ_INTERNAL = 0x02, |
| 129 | IRQ_TIMER = 0x04, | 129 | IRQ_TIMER = 0x04, |
| 130 | IRQ_SPECIAL = 0x08, | 130 | IRQ_SPECIAL = 0x08, |
| 131 | -} IRQ_src_type; | 131 | +}; |
| 132 | 132 | ||
| 133 | typedef struct IRQ_queue_t { | 133 | typedef struct IRQ_queue_t { |
| 134 | uint32_t queue[BF_WIDTH(MAX_IRQ)]; | 134 | uint32_t queue[BF_WIDTH(MAX_IRQ)]; |
hw/pc.h
| @@ -105,6 +105,7 @@ void i440fx_set_smm(PCIDevice *d, int val); | @@ -105,6 +105,7 @@ void i440fx_set_smm(PCIDevice *d, int val); | ||
| 105 | int piix3_init(PCIBus *bus, int devfn); | 105 | int piix3_init(PCIBus *bus, int devfn); |
| 106 | void i440fx_init_memory_mappings(PCIDevice *d); | 106 | void i440fx_init_memory_mappings(PCIDevice *d); |
| 107 | 107 | ||
| 108 | +extern PCIDevice *piix4_dev; | ||
| 108 | int piix4_init(PCIBus *bus, int devfn); | 109 | int piix4_init(PCIBus *bus, int devfn); |
| 109 | 110 | ||
| 110 | /* vga.c */ | 111 | /* vga.c */ |
hw/pckbd.c
| @@ -129,7 +129,7 @@ typedef struct KBDState { | @@ -129,7 +129,7 @@ typedef struct KBDState { | ||
| 129 | int it_shift; | 129 | int it_shift; |
| 130 | } KBDState; | 130 | } KBDState; |
| 131 | 131 | ||
| 132 | -KBDState kbd_state; | 132 | +static KBDState kbd_state; |
| 133 | 133 | ||
| 134 | /* update irq and KBD_STAT_[MOUSE_]OBF */ | 134 | /* update irq and KBD_STAT_[MOUSE_]OBF */ |
| 135 | /* XXX: not generating the irqs if KBD_MODE_DISABLE_KBD is set may be | 135 | /* XXX: not generating the irqs if KBD_MODE_DISABLE_KBD is set may be |
hw/piix_pci.c
| @@ -210,7 +210,7 @@ PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic) | @@ -210,7 +210,7 @@ PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic) | ||
| 210 | 210 | ||
| 211 | /* PIIX3 PCI to ISA bridge */ | 211 | /* PIIX3 PCI to ISA bridge */ |
| 212 | 212 | ||
| 213 | -PCIDevice *piix3_dev; | 213 | +static PCIDevice *piix3_dev; |
| 214 | PCIDevice *piix4_dev; | 214 | PCIDevice *piix4_dev; |
| 215 | 215 | ||
| 216 | /* just used for simpler irq handling. */ | 216 | /* just used for simpler irq handling. */ |
hw/ppc.c
| @@ -806,10 +806,12 @@ clk_setup_cb cpu_ppc_tb_init (CPUState *env, uint32_t freq) | @@ -806,10 +806,12 @@ clk_setup_cb cpu_ppc_tb_init (CPUState *env, uint32_t freq) | ||
| 806 | } | 806 | } |
| 807 | 807 | ||
| 808 | /* Specific helpers for POWER & PowerPC 601 RTC */ | 808 | /* Specific helpers for POWER & PowerPC 601 RTC */ |
| 809 | -clk_setup_cb cpu_ppc601_rtc_init (CPUState *env) | 809 | +#if 0 |
| 810 | +static clk_setup_cb cpu_ppc601_rtc_init (CPUState *env) | ||
| 810 | { | 811 | { |
| 811 | return cpu_ppc_tb_init(env, 7812500); | 812 | return cpu_ppc_tb_init(env, 7812500); |
| 812 | } | 813 | } |
| 814 | +#endif | ||
| 813 | 815 | ||
| 814 | void cpu_ppc601_store_rtcu (CPUState *env, uint32_t value) | 816 | void cpu_ppc601_store_rtcu (CPUState *env, uint32_t value) |
| 815 | { | 817 | { |
| @@ -1343,7 +1345,7 @@ static uint16_t NVRAM_crc_update (uint16_t prev, uint16_t value) | @@ -1343,7 +1345,7 @@ static uint16_t NVRAM_crc_update (uint16_t prev, uint16_t value) | ||
| 1343 | return tmp; | 1345 | return tmp; |
| 1344 | } | 1346 | } |
| 1345 | 1347 | ||
| 1346 | -uint16_t NVRAM_compute_crc (nvram_t *nvram, uint32_t start, uint32_t count) | 1348 | +static uint16_t NVRAM_compute_crc (nvram_t *nvram, uint32_t start, uint32_t count) |
| 1347 | { | 1349 | { |
| 1348 | uint32_t i; | 1350 | uint32_t i; |
| 1349 | uint16_t crc = 0xFFFF; | 1351 | uint16_t crc = 0xFFFF; |
hw/ppc.h
| @@ -29,3 +29,7 @@ void PREP_debug_write (void *opaque, uint32_t addr, uint32_t val); | @@ -29,3 +29,7 @@ void PREP_debug_write (void *opaque, uint32_t addr, uint32_t val); | ||
| 29 | extern CPUWriteMemoryFunc *PPC_io_write[]; | 29 | extern CPUWriteMemoryFunc *PPC_io_write[]; |
| 30 | extern CPUReadMemoryFunc *PPC_io_read[]; | 30 | extern CPUReadMemoryFunc *PPC_io_read[]; |
| 31 | void PPC_debug_write (void *opaque, uint32_t addr, uint32_t val); | 31 | void PPC_debug_write (void *opaque, uint32_t addr, uint32_t val); |
| 32 | + | ||
| 33 | +void ppc40x_irq_init (CPUState *env); | ||
| 34 | +void ppc6xx_irq_init (CPUState *env); | ||
| 35 | +void ppc970_irq_init (CPUState *env); |
hw/ppc_prep.c
| @@ -84,9 +84,11 @@ static int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 }; | @@ -84,9 +84,11 @@ static int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 }; | ||
| 84 | /* ISA IO ports bridge */ | 84 | /* ISA IO ports bridge */ |
| 85 | #define PPC_IO_BASE 0x80000000 | 85 | #define PPC_IO_BASE 0x80000000 |
| 86 | 86 | ||
| 87 | +#if 0 | ||
| 87 | /* Speaker port 0x61 */ | 88 | /* Speaker port 0x61 */ |
| 88 | -int speaker_data_on; | ||
| 89 | -int dummy_refresh_clock; | 89 | +static int speaker_data_on; |
| 90 | +static int dummy_refresh_clock; | ||
| 91 | +#endif | ||
| 90 | 92 | ||
| 91 | static void speaker_ioport_write (void *opaque, uint32_t addr, uint32_t val) | 93 | static void speaker_ioport_write (void *opaque, uint32_t addr, uint32_t val) |
| 92 | { | 94 | { |
| @@ -518,13 +520,13 @@ static uint32_t PPC_prep_io_readl (void *opaque, target_phys_addr_t addr) | @@ -518,13 +520,13 @@ static uint32_t PPC_prep_io_readl (void *opaque, target_phys_addr_t addr) | ||
| 518 | return ret; | 520 | return ret; |
| 519 | } | 521 | } |
| 520 | 522 | ||
| 521 | -CPUWriteMemoryFunc *PPC_prep_io_write[] = { | 523 | +static CPUWriteMemoryFunc *PPC_prep_io_write[] = { |
| 522 | &PPC_prep_io_writeb, | 524 | &PPC_prep_io_writeb, |
| 523 | &PPC_prep_io_writew, | 525 | &PPC_prep_io_writew, |
| 524 | &PPC_prep_io_writel, | 526 | &PPC_prep_io_writel, |
| 525 | }; | 527 | }; |
| 526 | 528 | ||
| 527 | -CPUReadMemoryFunc *PPC_prep_io_read[] = { | 529 | +static CPUReadMemoryFunc *PPC_prep_io_read[] = { |
| 528 | &PPC_prep_io_readb, | 530 | &PPC_prep_io_readb, |
| 529 | &PPC_prep_io_readw, | 531 | &PPC_prep_io_readw, |
| 530 | &PPC_prep_io_readl, | 532 | &PPC_prep_io_readl, |
hw/rtl8139.c
| @@ -1255,7 +1255,7 @@ static void rtl8139_reset(RTL8139State *s) | @@ -1255,7 +1255,7 @@ static void rtl8139_reset(RTL8139State *s) | ||
| 1255 | RTL8139TallyCounters_clear(&s->tally_counters); | 1255 | RTL8139TallyCounters_clear(&s->tally_counters); |
| 1256 | } | 1256 | } |
| 1257 | 1257 | ||
| 1258 | -void RTL8139TallyCounters_clear(RTL8139TallyCounters* counters) | 1258 | +static void RTL8139TallyCounters_clear(RTL8139TallyCounters* counters) |
| 1259 | { | 1259 | { |
| 1260 | counters->TxOk = 0; | 1260 | counters->TxOk = 0; |
| 1261 | counters->RxOk = 0; | 1261 | counters->RxOk = 0; |
hw/soc_dma.c
| @@ -23,20 +23,20 @@ | @@ -23,20 +23,20 @@ | ||
| 23 | #include "qemu-timer.h" | 23 | #include "qemu-timer.h" |
| 24 | #include "soc_dma.h" | 24 | #include "soc_dma.h" |
| 25 | 25 | ||
| 26 | -void transfer_mem2mem(struct soc_dma_ch_s *ch) | 26 | +static void transfer_mem2mem(struct soc_dma_ch_s *ch) |
| 27 | { | 27 | { |
| 28 | memcpy(ch->paddr[0], ch->paddr[1], ch->bytes); | 28 | memcpy(ch->paddr[0], ch->paddr[1], ch->bytes); |
| 29 | ch->paddr[0] += ch->bytes; | 29 | ch->paddr[0] += ch->bytes; |
| 30 | ch->paddr[1] += ch->bytes; | 30 | ch->paddr[1] += ch->bytes; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | -void transfer_mem2fifo(struct soc_dma_ch_s *ch) | 33 | +static void transfer_mem2fifo(struct soc_dma_ch_s *ch) |
| 34 | { | 34 | { |
| 35 | ch->io_fn[1](ch->io_opaque[1], ch->paddr[0], ch->bytes); | 35 | ch->io_fn[1](ch->io_opaque[1], ch->paddr[0], ch->bytes); |
| 36 | ch->paddr[0] += ch->bytes; | 36 | ch->paddr[0] += ch->bytes; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | -void transfer_fifo2mem(struct soc_dma_ch_s *ch) | 39 | +static void transfer_fifo2mem(struct soc_dma_ch_s *ch) |
| 40 | { | 40 | { |
| 41 | ch->io_fn[0](ch->io_opaque[0], ch->paddr[1], ch->bytes); | 41 | ch->io_fn[0](ch->io_opaque[0], ch->paddr[1], ch->bytes); |
| 42 | ch->paddr[1] += ch->bytes; | 42 | ch->paddr[1] += ch->bytes; |
| @@ -47,7 +47,7 @@ void transfer_fifo2mem(struct soc_dma_ch_s *ch) | @@ -47,7 +47,7 @@ void transfer_fifo2mem(struct soc_dma_ch_s *ch) | ||
| 47 | * oprating systems may not need to use them. */ | 47 | * oprating systems may not need to use them. */ |
| 48 | static void *fifo_buf; | 48 | static void *fifo_buf; |
| 49 | static int fifo_size; | 49 | static int fifo_size; |
| 50 | -void transfer_fifo2fifo(struct soc_dma_ch_s *ch) | 50 | +static void transfer_fifo2fifo(struct soc_dma_ch_s *ch) |
| 51 | { | 51 | { |
| 52 | if (ch->bytes > fifo_size) | 52 | if (ch->bytes > fifo_size) |
| 53 | fifo_buf = qemu_realloc(fifo_buf, fifo_size = ch->bytes); | 53 | fifo_buf = qemu_realloc(fifo_buf, fifo_size = ch->bytes); |
hw/tc58128.c
| @@ -58,7 +58,7 @@ static void init_dev(tc58128_dev * dev, const char *filename) | @@ -58,7 +58,7 @@ static void init_dev(tc58128_dev * dev, const char *filename) | ||
| 58 | } | 58 | } |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | -void handle_command(tc58128_dev * dev, uint8_t command) | 61 | +static void handle_command(tc58128_dev * dev, uint8_t command) |
| 62 | { | 62 | { |
| 63 | switch (command) { | 63 | switch (command) { |
| 64 | case 0xff: | 64 | case 0xff: |
| @@ -86,7 +86,7 @@ void handle_command(tc58128_dev * dev, uint8_t command) | @@ -86,7 +86,7 @@ void handle_command(tc58128_dev * dev, uint8_t command) | ||
| 86 | } | 86 | } |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | -void handle_address(tc58128_dev * dev, uint8_t data) | 89 | +static void handle_address(tc58128_dev * dev, uint8_t data) |
| 90 | { | 90 | { |
| 91 | switch (dev->state) { | 91 | switch (dev->state) { |
| 92 | case READ1: | 92 | case READ1: |
| @@ -119,7 +119,7 @@ void handle_address(tc58128_dev * dev, uint8_t data) | @@ -119,7 +119,7 @@ void handle_address(tc58128_dev * dev, uint8_t data) | ||
| 119 | } | 119 | } |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | -uint8_t handle_read(tc58128_dev * dev) | 122 | +static uint8_t handle_read(tc58128_dev * dev) |
| 123 | { | 123 | { |
| 124 | #if 0 | 124 | #if 0 |
| 125 | if (dev->address % 0x100000 == 0) | 125 | if (dev->address % 0x100000 == 0) |
| @@ -131,9 +131,9 @@ uint8_t handle_read(tc58128_dev * dev) | @@ -131,9 +131,9 @@ uint8_t handle_read(tc58128_dev * dev) | ||
| 131 | /* We never mark the device as busy, so interrupts cannot be triggered | 131 | /* We never mark the device as busy, so interrupts cannot be triggered |
| 132 | XXXXX */ | 132 | XXXXX */ |
| 133 | 133 | ||
| 134 | -int tc58128_cb(uint16_t porta, uint16_t portb, | ||
| 135 | - uint16_t * periph_pdtra, uint16_t * periph_portadir, | ||
| 136 | - uint16_t * periph_pdtrb, uint16_t * periph_portbdir) | 134 | +static int tc58128_cb(uint16_t porta, uint16_t portb, |
| 135 | + uint16_t * periph_pdtra, uint16_t * periph_portadir, | ||
| 136 | + uint16_t * periph_pdtrb, uint16_t * periph_portbdir) | ||
| 137 | { | 137 | { |
| 138 | int dev; | 138 | int dev; |
| 139 | 139 |
hw/tsc2005.c
| @@ -23,6 +23,7 @@ | @@ -23,6 +23,7 @@ | ||
| 23 | #include "hw.h" | 23 | #include "hw.h" |
| 24 | #include "qemu-timer.h" | 24 | #include "qemu-timer.h" |
| 25 | #include "console.h" | 25 | #include "console.h" |
| 26 | +#include "devices.h" | ||
| 26 | 27 | ||
| 27 | #define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10))) | 28 | #define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10))) |
| 28 | 29 | ||
| @@ -319,7 +320,7 @@ static void tsc2005_reset(struct tsc2005_state_s *s) | @@ -319,7 +320,7 @@ static void tsc2005_reset(struct tsc2005_state_s *s) | ||
| 319 | tsc2005_pin_update(s); | 320 | tsc2005_pin_update(s); |
| 320 | } | 321 | } |
| 321 | 322 | ||
| 322 | -uint8_t tsc2005_txrx_word(void *opaque, uint8_t value) | 323 | +static uint8_t tsc2005_txrx_word(void *opaque, uint8_t value) |
| 323 | { | 324 | { |
| 324 | struct tsc2005_state_s *s = opaque; | 325 | struct tsc2005_state_s *s = opaque; |
| 325 | uint32_t ret = 0; | 326 | uint32_t ret = 0; |
hw/tsc210x.c
| @@ -26,6 +26,7 @@ | @@ -26,6 +26,7 @@ | ||
| 26 | #include "qemu-timer.h" | 26 | #include "qemu-timer.h" |
| 27 | #include "console.h" | 27 | #include "console.h" |
| 28 | #include "omap.h" /* For struct i2s_codec_s and struct uwire_slave_s */ | 28 | #include "omap.h" /* For struct i2s_codec_s and struct uwire_slave_s */ |
| 29 | +#include "devices.h" | ||
| 29 | 30 | ||
| 30 | #define TSC_DATA_REGISTERS_PAGE 0x0 | 31 | #define TSC_DATA_REGISTERS_PAGE 0x0 |
| 31 | #define TSC_CONTROL_REGISTERS_PAGE 0x1 | 32 | #define TSC_CONTROL_REGISTERS_PAGE 0x1 |
hw/tusb6010.c
hw/zaurus.c
| @@ -155,12 +155,12 @@ static void scoop_writeb(void *opaque, target_phys_addr_t addr, uint32_t value) | @@ -155,12 +155,12 @@ static void scoop_writeb(void *opaque, target_phys_addr_t addr, uint32_t value) | ||
| 155 | } | 155 | } |
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | -CPUReadMemoryFunc *scoop_readfn[] = { | 158 | +static CPUReadMemoryFunc *scoop_readfn[] = { |
| 159 | scoop_readb, | 159 | scoop_readb, |
| 160 | scoop_readb, | 160 | scoop_readb, |
| 161 | scoop_readb, | 161 | scoop_readb, |
| 162 | }; | 162 | }; |
| 163 | -CPUWriteMemoryFunc *scoop_writefn[] = { | 163 | +static CPUWriteMemoryFunc *scoop_writefn[] = { |
| 164 | scoop_writeb, | 164 | scoop_writeb, |
| 165 | scoop_writeb, | 165 | scoop_writeb, |
| 166 | scoop_writeb, | 166 | scoop_writeb, |
| @@ -252,7 +252,7 @@ struct scoop_info_s *scoop_init(struct pxa2xx_state_s *cpu, | @@ -252,7 +252,7 @@ struct scoop_info_s *scoop_init(struct pxa2xx_state_s *cpu, | ||
| 252 | 252 | ||
| 253 | #define MAGIC_CHG(a, b, c, d) ((d << 24) | (c << 16) | (b << 8) | a) | 253 | #define MAGIC_CHG(a, b, c, d) ((d << 24) | (c << 16) | (b << 8) | a) |
| 254 | 254 | ||
| 255 | -struct __attribute__ ((__packed__)) sl_param_info { | 255 | +static struct __attribute__ ((__packed__)) sl_param_info { |
| 256 | uint32_t comadj_keyword; | 256 | uint32_t comadj_keyword; |
| 257 | int32_t comadj; | 257 | int32_t comadj; |
| 258 | 258 |
linux-user/flatload.c
| @@ -102,8 +102,8 @@ static abi_ulong copy_strings(abi_ulong p, int n, char **s) | @@ -102,8 +102,8 @@ static abi_ulong copy_strings(abi_ulong p, int n, char **s) | ||
| 102 | return p; | 102 | return p; |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | -int target_pread(int fd, abi_ulong ptr, abi_ulong len, | ||
| 106 | - abi_ulong offset) | 105 | +static int target_pread(int fd, abi_ulong ptr, abi_ulong len, |
| 106 | + abi_ulong offset) | ||
| 107 | { | 107 | { |
| 108 | void *buf; | 108 | void *buf; |
| 109 | int ret; | 109 | int ret; |
| @@ -336,7 +336,7 @@ failed: | @@ -336,7 +336,7 @@ failed: | ||
| 336 | /****************************************************************************/ | 336 | /****************************************************************************/ |
| 337 | 337 | ||
| 338 | /* ??? This does not handle endianness correctly. */ | 338 | /* ??? This does not handle endianness correctly. */ |
| 339 | -void old_reloc(struct lib_info *libinfo, uint32_t rl) | 339 | +static void old_reloc(struct lib_info *libinfo, uint32_t rl) |
| 340 | { | 340 | { |
| 341 | #ifdef DEBUG | 341 | #ifdef DEBUG |
| 342 | char *segment[] = { "TEXT", "DATA", "BSS", "*UNKNOWN*" }; | 342 | char *segment[] = { "TEXT", "DATA", "BSS", "*UNKNOWN*" }; |
linux-user/main.c
| @@ -283,7 +283,7 @@ static void write_dt(void *ptr, unsigned long addr, unsigned long limit, | @@ -283,7 +283,7 @@ static void write_dt(void *ptr, unsigned long addr, unsigned long limit, | ||
| 283 | } | 283 | } |
| 284 | 284 | ||
| 285 | #ifdef TARGET_X86_64 | 285 | #ifdef TARGET_X86_64 |
| 286 | -uint64_t idt_table[512]; | 286 | +static uint64_t idt_table[512]; |
| 287 | 287 | ||
| 288 | static void set_gate64(void *ptr, unsigned int type, unsigned int dpl, | 288 | static void set_gate64(void *ptr, unsigned int type, unsigned int dpl, |
| 289 | uint64_t addr, unsigned int sel) | 289 | uint64_t addr, unsigned int sel) |
| @@ -303,7 +303,7 @@ static void set_idt(int n, unsigned int dpl) | @@ -303,7 +303,7 @@ static void set_idt(int n, unsigned int dpl) | ||
| 303 | set_gate64(idt_table + n * 2, 0, dpl, 0, 0); | 303 | set_gate64(idt_table + n * 2, 0, dpl, 0, 0); |
| 304 | } | 304 | } |
| 305 | #else | 305 | #else |
| 306 | -uint64_t idt_table[256]; | 306 | +static uint64_t idt_table[256]; |
| 307 | 307 | ||
| 308 | static void set_gate(void *ptr, unsigned int type, unsigned int dpl, | 308 | static void set_gate(void *ptr, unsigned int type, unsigned int dpl, |
| 309 | uint32_t addr, unsigned int sel) | 309 | uint32_t addr, unsigned int sel) |
linux-user/syscall.c
| @@ -2500,7 +2500,7 @@ static bitmask_transtbl fcntl_flags_tbl[] = { | @@ -2500,7 +2500,7 @@ static bitmask_transtbl fcntl_flags_tbl[] = { | ||
| 2500 | #if defined(TARGET_I386) | 2500 | #if defined(TARGET_I386) |
| 2501 | 2501 | ||
| 2502 | /* NOTE: there is really one LDT for all the threads */ | 2502 | /* NOTE: there is really one LDT for all the threads */ |
| 2503 | -uint8_t *ldt_table; | 2503 | +static uint8_t *ldt_table; |
| 2504 | 2504 | ||
| 2505 | static abi_long read_ldt(abi_ulong ptr, unsigned long bytecount) | 2505 | static abi_long read_ldt(abi_ulong ptr, unsigned long bytecount) |
| 2506 | { | 2506 | { |
monitor.c
| @@ -75,7 +75,7 @@ static int term_outbuf_index; | @@ -75,7 +75,7 @@ static int term_outbuf_index; | ||
| 75 | 75 | ||
| 76 | static void monitor_start_input(void); | 76 | static void monitor_start_input(void); |
| 77 | 77 | ||
| 78 | -CPUState *mon_cpu = NULL; | 78 | +static CPUState *mon_cpu = NULL; |
| 79 | 79 | ||
| 80 | void term_flush(void) | 80 | void term_flush(void) |
| 81 | { | 81 | { |
qemu-nbd.c
sparc-dis.c
| @@ -2181,7 +2181,7 @@ static const arg membar_table[] = | @@ -2181,7 +2181,7 @@ static const arg membar_table[] = | ||
| 2181 | 2181 | ||
| 2182 | /* Return the name for membar value VALUE or NULL if not found. */ | 2182 | /* Return the name for membar value VALUE or NULL if not found. */ |
| 2183 | 2183 | ||
| 2184 | -const char * | 2184 | +static const char * |
| 2185 | sparc_decode_membar (value) | 2185 | sparc_decode_membar (value) |
| 2186 | int value; | 2186 | int value; |
| 2187 | { | 2187 | { |
| @@ -2203,7 +2203,7 @@ static const arg prefetch_table[] = | @@ -2203,7 +2203,7 @@ static const arg prefetch_table[] = | ||
| 2203 | 2203 | ||
| 2204 | /* Return the name for prefetch value VALUE or NULL if not found. */ | 2204 | /* Return the name for prefetch value VALUE or NULL if not found. */ |
| 2205 | 2205 | ||
| 2206 | -const char * | 2206 | +static const char * |
| 2207 | sparc_decode_prefetch (value) | 2207 | sparc_decode_prefetch (value) |
| 2208 | int value; | 2208 | int value; |
| 2209 | { | 2209 | { |
| @@ -2226,7 +2226,7 @@ static const arg sparclet_cpreg_table[] = | @@ -2226,7 +2226,7 @@ static const arg sparclet_cpreg_table[] = | ||
| 2226 | 2226 | ||
| 2227 | /* Return the name for sparclet cpreg value VALUE or NULL if not found. */ | 2227 | /* Return the name for sparclet cpreg value VALUE or NULL if not found. */ |
| 2228 | 2228 | ||
| 2229 | -const char * | 2229 | +static const char * |
| 2230 | sparc_decode_sparclet_cpreg (value) | 2230 | sparc_decode_sparclet_cpreg (value) |
| 2231 | int value; | 2231 | int value; |
| 2232 | { | 2232 | { |
target-arm/op_helper.c
| @@ -31,7 +31,7 @@ void raise_exception(int tt) | @@ -31,7 +31,7 @@ void raise_exception(int tt) | ||
| 31 | 31 | ||
| 32 | /* thread support */ | 32 | /* thread support */ |
| 33 | 33 | ||
| 34 | -spinlock_t global_cpu_lock = SPIN_LOCK_UNLOCKED; | 34 | +static spinlock_t global_cpu_lock = SPIN_LOCK_UNLOCKED; |
| 35 | 35 | ||
| 36 | void cpu_lock(void) | 36 | void cpu_lock(void) |
| 37 | { | 37 | { |
target-arm/translate.c
| @@ -756,7 +756,7 @@ static void gen_test_cc(int cc, int label) | @@ -756,7 +756,7 @@ static void gen_test_cc(int cc, int label) | ||
| 756 | dead_tmp(tmp); | 756 | dead_tmp(tmp); |
| 757 | } | 757 | } |
| 758 | 758 | ||
| 759 | -const uint8_t table_logic_cc[16] = { | 759 | +static const uint8_t table_logic_cc[16] = { |
| 760 | 1, /* and */ | 760 | 1, /* and */ |
| 761 | 1, /* xor */ | 761 | 1, /* xor */ |
| 762 | 0, /* sub */ | 762 | 0, /* sub */ |
target-i386/op_helper.c
| @@ -96,7 +96,7 @@ const CPU86_LDouble f15rk[7] = | @@ -96,7 +96,7 @@ const CPU86_LDouble f15rk[7] = | ||
| 96 | 96 | ||
| 97 | /* broken thread support */ | 97 | /* broken thread support */ |
| 98 | 98 | ||
| 99 | -spinlock_t global_cpu_lock = SPIN_LOCK_UNLOCKED; | 99 | +static spinlock_t global_cpu_lock = SPIN_LOCK_UNLOCKED; |
| 100 | 100 | ||
| 101 | void helper_lock(void) | 101 | void helper_lock(void) |
| 102 | { | 102 | { |
target-sh4/translate.c
| @@ -459,7 +459,7 @@ static inline void gen_store_fpr64 (TCGv t, int reg) | @@ -459,7 +459,7 @@ static inline void gen_store_fpr64 (TCGv t, int reg) | ||
| 459 | return; \ | 459 | return; \ |
| 460 | } | 460 | } |
| 461 | 461 | ||
| 462 | -void _decode_opc(DisasContext * ctx) | 462 | +static void _decode_opc(DisasContext * ctx) |
| 463 | { | 463 | { |
| 464 | #if 0 | 464 | #if 0 |
| 465 | fprintf(stderr, "Translating opcode 0x%04x\n", ctx->opcode); | 465 | fprintf(stderr, "Translating opcode 0x%04x\n", ctx->opcode); |
| @@ -1762,7 +1762,7 @@ void _decode_opc(DisasContext * ctx) | @@ -1762,7 +1762,7 @@ void _decode_opc(DisasContext * ctx) | ||
| 1762 | ctx->bstate = BS_EXCP; | 1762 | ctx->bstate = BS_EXCP; |
| 1763 | } | 1763 | } |
| 1764 | 1764 | ||
| 1765 | -void decode_opc(DisasContext * ctx) | 1765 | +static void decode_opc(DisasContext * ctx) |
| 1766 | { | 1766 | { |
| 1767 | uint32_t old_flags = ctx->flags; | 1767 | uint32_t old_flags = ctx->flags; |
| 1768 | 1768 |
tcg/tcg.c
| @@ -63,8 +63,8 @@ TCGOpDef tcg_op_defs[] = { | @@ -63,8 +63,8 @@ TCGOpDef tcg_op_defs[] = { | ||
| 63 | #undef DEF2 | 63 | #undef DEF2 |
| 64 | }; | 64 | }; |
| 65 | 65 | ||
| 66 | -TCGRegSet tcg_target_available_regs[2]; | ||
| 67 | -TCGRegSet tcg_target_call_clobber_regs; | 66 | +static TCGRegSet tcg_target_available_regs[2]; |
| 67 | +static TCGRegSet tcg_target_call_clobber_regs; | ||
| 68 | 68 | ||
| 69 | /* XXX: move that inside the context */ | 69 | /* XXX: move that inside the context */ |
| 70 | uint16_t *gen_opc_ptr; | 70 | uint16_t *gen_opc_ptr; |