Revision 9596ebb7

b/audio/audio.c
238 238
    return r;
239 239
}
240 240

  
241
const char *audio_audfmt_to_string (audfmt_e fmt)
241
static const char *audio_audfmt_to_string (audfmt_e fmt)
242 242
{
243 243
    switch (fmt) {
244 244
    case AUD_FMT_U8:
......
264 264
    return "S16";
265 265
}
266 266

  
267
audfmt_e audio_string_to_audfmt (const char *s, audfmt_e defval, int *defaultp)
267
static audfmt_e audio_string_to_audfmt (const char *s, audfmt_e defval,
268
                                        int *defaultp)
268 269
{
269 270
    if (!strcasecmp (s, "u8")) {
270 271
        *defaultp = 0;
b/block-vvfat.c
175 175
    return 0;
176 176
}
177 177

  
178
inline int array_remove_slice(array_t* array,int index, int count)
178
static inline int array_remove_slice(array_t* array,int index, int count)
179 179
{
180 180
    assert(index >=0);
181 181
    assert(count > 0);
......
186 186
    return 0;
187 187
}
188 188

  
189
int array_remove(array_t* array,int index)
189
static int array_remove(array_t* array,int index)
190 190
{
191 191
    return array_remove_slice(array, index, 1);
192 192
}
193 193

  
194 194
/* return the index for a given member */
195
int array_index(array_t* array, void* pointer)
195
static int array_index(array_t* array, void* pointer)
196 196
{
197 197
    size_t offset = (char*)pointer - array->pointer;
198 198
    assert(offset >= 0);
b/block.c
124 124
}
125 125

  
126 126

  
127
void bdrv_register(BlockDriver *bdrv)
127
static void bdrv_register(BlockDriver *bdrv)
128 128
{
129 129
    if (!bdrv->bdrv_aio_read) {
130 130
        /* add AIO emulation layer */
b/console.c
61 61
    int count, wptr, rptr;
62 62
} QEMUFIFO;
63 63

  
64
int qemu_fifo_write(QEMUFIFO *f, const uint8_t *buf, int len1)
64
static int qemu_fifo_write(QEMUFIFO *f, const uint8_t *buf, int len1)
65 65
{
66 66
    int l, len;
67 67

  
......
84 84
    return len1;
85 85
}
86 86

  
87
int qemu_fifo_read(QEMUFIFO *f, uint8_t *buf, int len1)
87
static int qemu_fifo_read(QEMUFIFO *f, uint8_t *buf, int len1)
88 88
{
89 89
    int l, len;
90 90

  
b/dyngen.c
232 232

  
233 233
int do_swap;
234 234

  
235
void __attribute__((noreturn)) __attribute__((format (printf, 1, 2))) error(const char *fmt, ...)
235
static void __attribute__((noreturn)) __attribute__((format (printf, 1, 2))) error(const char *fmt, ...)
236 236
{
237 237
    va_list ap;
238 238
    va_start(ap, fmt);
......
243 243
    exit(1);
244 244
}
245 245

  
246
void *load_data(int fd, long offset, unsigned int size)
246
static void *load_data(int fd, long offset, unsigned int size)
247 247
{
248 248
    char *data;
249 249

  
b/elf_ops.h
138 138
    return -1;
139 139
}
140 140

  
141
int glue(load_elf, SZ)(int fd, int64_t virt_to_phys_addend,
142
                       int must_swab, uint64_t *pentry,
143
                       uint64_t *lowaddr, uint64_t *highaddr)
141
static int glue(load_elf, SZ)(int fd, int64_t virt_to_phys_addend,
142
                              int must_swab, uint64_t *pentry,
143
                              uint64_t *lowaddr, uint64_t *highaddr)
144 144
{
145 145
    struct elfhdr ehdr;
146 146
    struct elf_phdr *phdr = NULL, *ph;
b/hw/arm_sysctl.c
8 8
 */
9 9

  
10 10
#include "hw.h"
11
#include "arm-misc.h"
11
#include "primecell.h"
12 12
#include "sysemu.h"
13 13

  
14 14
#define LOCK_VALUE 0xa05f
b/hw/arm_timer.c
8 8
 */
9 9

  
10 10
#include "hw.h"
11
#include "arm-misc.h"
12 11
#include "qemu-timer.h"
12
#include "primecell.h"
13 13

  
14 14
/* Common timer implementation.  */
15 15

  
......
43 43
    }
44 44
}
45 45

  
46
uint32_t arm_timer_read(void *opaque, target_phys_addr_t offset)
46
static uint32_t arm_timer_read(void *opaque, target_phys_addr_t offset)
47 47
{
48 48
    arm_timer_state *s = (arm_timer_state *)opaque;
49 49

  
b/hw/gt64xxx.c
908 908
}
909 909

  
910 910

  
911
void gt64120_reset(void *opaque)
911
static void gt64120_reset(void *opaque)
912 912
{
913 913
    GT64120State *s = opaque;
914 914

  
b/hw/i8259.c
178 178
int64_t irq_time[16];
179 179
#endif
180 180

  
181
void i8259_set_irq(void *opaque, int irq, int level)
181
static void i8259_set_irq(void *opaque, int irq, int level)
182 182
{
183 183
    PicState2 *s = opaque;
184 184

  
b/hw/ide.c
30 30
#include "block.h"
31 31
#include "qemu-timer.h"
32 32
#include "sysemu.h"
33
#include "ppc_mac.h"
33 34

  
34 35
/* debug IDE devices */
35 36
//#define DEBUG_IDE
b/hw/mc146818rtc.c
390 390
#define REG_IBM_CENTURY_BYTE        0x32
391 391
#define REG_IBM_PS2_CENTURY_BYTE    0x37
392 392

  
393
void rtc_set_date_from_host(RTCState *s)
393
static void rtc_set_date_from_host(RTCState *s)
394 394
{
395 395
    time_t ti;
396 396
    struct tm *tm;
......
498 498
}
499 499

  
500 500
/* Memory mapped interface */
501
uint32_t cmos_mm_readb (void *opaque, target_phys_addr_t addr)
501
static uint32_t cmos_mm_readb (void *opaque, target_phys_addr_t addr)
502 502
{
503 503
    RTCState *s = opaque;
504 504

  
505 505
    return cmos_ioport_read(s, (addr - s->base) >> s->it_shift) & 0xFF;
506 506
}
507 507

  
508
void cmos_mm_writeb (void *opaque,
509
                     target_phys_addr_t addr, uint32_t value)
508
static void cmos_mm_writeb (void *opaque,
509
                            target_phys_addr_t addr, uint32_t value)
510 510
{
511 511
    RTCState *s = opaque;
512 512

  
513 513
    cmos_ioport_write(s, (addr - s->base) >> s->it_shift, value & 0xFF);
514 514
}
515 515

  
516
uint32_t cmos_mm_readw (void *opaque, target_phys_addr_t addr)
516
static uint32_t cmos_mm_readw (void *opaque, target_phys_addr_t addr)
517 517
{
518 518
    RTCState *s = opaque;
519 519
    uint32_t val;
......
525 525
    return val;
526 526
}
527 527

  
528
void cmos_mm_writew (void *opaque,
529
                     target_phys_addr_t addr, uint32_t value)
528
static void cmos_mm_writew (void *opaque,
529
                            target_phys_addr_t addr, uint32_t value)
530 530
{
531 531
    RTCState *s = opaque;
532 532
#ifdef TARGET_WORDS_BIGENDIAN
......
535 535
    cmos_ioport_write(s, (addr - s->base) >> s->it_shift, value & 0xFFFF);
536 536
}
537 537

  
538
uint32_t cmos_mm_readl (void *opaque, target_phys_addr_t addr)
538
static uint32_t cmos_mm_readl (void *opaque, target_phys_addr_t addr)
539 539
{
540 540
    RTCState *s = opaque;
541 541
    uint32_t val;
......
547 547
    return val;
548 548
}
549 549

  
550
void cmos_mm_writel (void *opaque,
551
                     target_phys_addr_t addr, uint32_t value)
550
static void cmos_mm_writel (void *opaque,
551
                            target_phys_addr_t addr, uint32_t value)
552 552
{
553 553
    RTCState *s = opaque;
554 554
#ifdef TARGET_WORDS_BIGENDIAN
b/hw/mcf_fec.c
251 251
    }
252 252
}
253 253

  
254
void mcf_fec_write(void *opaque, target_phys_addr_t addr, uint32_t value)
254
static void mcf_fec_write(void *opaque, target_phys_addr_t addr, uint32_t value)
255 255
{
256 256
    mcf_fec_state *s = (mcf_fec_state *)opaque;
257 257
    switch (addr & 0x3ff) {
b/hw/mips_malta.c
398 398
   malta_fpga_writel
399 399
};
400 400

  
401
void malta_fpga_reset(void *opaque)
401
static void malta_fpga_reset(void *opaque)
402 402
{
403 403
    MaltaFPGAState *s = opaque;
404 404

  
......
415 415
    malta_fpga_update_display(s);
416 416
}
417 417

  
418
MaltaFPGAState *malta_fpga_init(target_phys_addr_t base, CPUState *env)
418
static MaltaFPGAState *malta_fpga_init(target_phys_addr_t base, CPUState *env)
419 419
{
420 420
    MaltaFPGAState *s;
421 421
    CharDriverState *uart_chr;
b/hw/ne2000.c
23 23
 */
24 24
#include "hw.h"
25 25
#include "pci.h"
26
#include "pc.h"
26 27
#include "net.h"
27 28

  
28 29
/* debug NE2000 card */
b/hw/nvram.h
37 37
m48t59_t *m48t59_init (qemu_irq IRQ, target_phys_addr_t mem_base,
38 38
                       uint32_t io_base, uint16_t size,
39 39
                       int type);
40
void m48t59_set_addr (void *opaque, uint32_t addr);
40 41

  
41 42
#endif /* !NVRAM_H */
b/hw/omap.c
3041 3041
    omap_badwidth_write16,
3042 3042
};
3043 3043

  
3044
void omap_mpuio_reset(struct omap_mpuio_s *s)
3044
static void omap_mpuio_reset(struct omap_mpuio_s *s)
3045 3045
{
3046 3046
    s->inputs = 0;
3047 3047
    s->outputs = 0;
......
3257 3257
    omap_badwidth_write16,
3258 3258
};
3259 3259

  
3260
void omap_gpio_reset(struct omap_gpio_s *s)
3260
static void omap_gpio_reset(struct omap_gpio_s *s)
3261 3261
{
3262 3262
    s->inputs = 0;
3263 3263
    s->outputs = ~0;
......
3429 3429
    omap_badwidth_write16,
3430 3430
};
3431 3431

  
3432
void omap_uwire_reset(struct omap_uwire_s *s)
3432
static void omap_uwire_reset(struct omap_uwire_s *s)
3433 3433
{
3434 3434
    s->control = 0;
3435 3435
    s->setup[0] = 0;
......
3470 3470
}
3471 3471

  
3472 3472
/* Pseudonoise Pulse-Width Light Modulator */
3473
void omap_pwl_update(struct omap_mpu_state_s *s)
3473
static void omap_pwl_update(struct omap_mpu_state_s *s)
3474 3474
{
3475 3475
    int output = (s->pwl.clk && s->pwl.enable) ? s->pwl.level : 0;
3476 3476

  
......
3528 3528
    omap_badwidth_write8,
3529 3529
};
3530 3530

  
3531
void omap_pwl_reset(struct omap_mpu_state_s *s)
3531
static void omap_pwl_reset(struct omap_mpu_state_s *s)
3532 3532
{
3533 3533
    s->pwl.output = 0;
3534 3534
    s->pwl.level = 0;
......
3632 3632
    omap_badwidth_write8,
3633 3633
};
3634 3634

  
3635
void omap_pwt_reset(struct omap_mpu_state_s *s)
3635
static void omap_pwt_reset(struct omap_mpu_state_s *s)
3636 3636
{
3637 3637
    s->pwt.frc = 0;
3638 3638
    s->pwt.vrc = 0;
......
4037 4037
    qemu_mod_timer(s->clk, s->tick);
4038 4038
}
4039 4039

  
4040
void omap_rtc_reset(struct omap_rtc_s *s)
4040
static void omap_rtc_reset(struct omap_rtc_s *s)
4041 4041
{
4042 4042
    s->interrupts = 0;
4043 4043
    s->comp_reg = 0;
......
4509 4509
    return s;
4510 4510
}
4511 4511

  
4512
void omap_mcbsp_i2s_swallow(void *opaque, int line, int level)
4512
static void omap_mcbsp_i2s_swallow(void *opaque, int line, int level)
4513 4513
{
4514 4514
    struct omap_mcbsp_s *s = (struct omap_mcbsp_s *) opaque;
4515 4515

  
4516 4516
    omap_mcbsp_rx_start(s);
4517 4517
}
4518 4518

  
4519
void omap_mcbsp_i2s_start(void *opaque, int line, int level)
4519
static void omap_mcbsp_i2s_start(void *opaque, int line, int level)
4520 4520
{
4521 4521
    struct omap_mcbsp_s *s = (struct omap_mcbsp_s *) opaque;
4522 4522

  
b/hw/omap.h
662 662
#  error TARGET_PHYS_ADDR_BITS undefined
663 663
# endif
664 664

  
665
uint32_t omap_badwidth_read8(void *opaque, target_phys_addr_t addr);
666
void omap_badwidth_write8(void *opaque, target_phys_addr_t addr,
667
                uint32_t value);
665 668
uint32_t omap_badwidth_read16(void *opaque, target_phys_addr_t addr);
666 669
void omap_badwidth_write16(void *opaque, target_phys_addr_t addr,
667 670
                uint32_t value);
b/hw/omap_lcdc.c
114 114
    [32]	= draw_line16_32,
115 115
};
116 116

  
117
void omap_update_display(void *opaque)
117
static void omap_update_display(void *opaque)
118 118
{
119 119
    struct omap_lcd_panel_s *omap_lcd = (struct omap_lcd_panel_s *) opaque;
120 120
    draw_line_func *draw_line;
......
289 289
    return 0;
290 290
}
291 291

  
292
void omap_screen_dump(void *opaque, const char *filename) {
292
static void omap_screen_dump(void *opaque, const char *filename) {
293 293
    struct omap_lcd_panel_s *omap_lcd = opaque;
294 294
    omap_update_display(opaque);
295 295
    if (omap_lcd && omap_lcd->state->data)
......
298 298
                omap_lcd->state->linesize);
299 299
}
300 300

  
301
void omap_invalidate_display(void *opaque) {
301
static void omap_invalidate_display(void *opaque) {
302 302
    struct omap_lcd_panel_s *omap_lcd = opaque;
303 303
    omap_lcd->invalidate = 1;
304 304
}
305 305

  
306
void omap_lcd_update(struct omap_lcd_panel_s *s) {
306
static void omap_lcd_update(struct omap_lcd_panel_s *s) {
307 307
    if (!s->enable) {
308 308
        s->dma->current_frame = -1;
309 309
        s->sync_error = 0;
b/hw/parallel.c
458 458
}
459 459

  
460 460
/* Memory mapped interface */
461
uint32_t parallel_mm_readb (void *opaque, target_phys_addr_t addr)
461
static uint32_t parallel_mm_readb (void *opaque, target_phys_addr_t addr)
462 462
{
463 463
    ParallelState *s = opaque;
464 464

  
465 465
    return parallel_ioport_read_sw(s, (addr - s->base) >> s->it_shift) & 0xFF;
466 466
}
467 467

  
468
void parallel_mm_writeb (void *opaque,
469
                       target_phys_addr_t addr, uint32_t value)
468
static void parallel_mm_writeb (void *opaque,
469
                                target_phys_addr_t addr, uint32_t value)
470 470
{
471 471
    ParallelState *s = opaque;
472 472

  
473 473
    parallel_ioport_write_sw(s, (addr - s->base) >> s->it_shift, value & 0xFF);
474 474
}
475 475

  
476
uint32_t parallel_mm_readw (void *opaque, target_phys_addr_t addr)
476
static uint32_t parallel_mm_readw (void *opaque, target_phys_addr_t addr)
477 477
{
478 478
    ParallelState *s = opaque;
479 479

  
480 480
    return parallel_ioport_read_sw(s, (addr - s->base) >> s->it_shift) & 0xFFFF;
481 481
}
482 482

  
483
void parallel_mm_writew (void *opaque,
484
                       target_phys_addr_t addr, uint32_t value)
483
static void parallel_mm_writew (void *opaque,
484
                                target_phys_addr_t addr, uint32_t value)
485 485
{
486 486
    ParallelState *s = opaque;
487 487

  
488 488
    parallel_ioport_write_sw(s, (addr - s->base) >> s->it_shift, value & 0xFFFF);
489 489
}
490 490

  
491
uint32_t parallel_mm_readl (void *opaque, target_phys_addr_t addr)
491
static uint32_t parallel_mm_readl (void *opaque, target_phys_addr_t addr)
492 492
{
493 493
    ParallelState *s = opaque;
494 494

  
495 495
    return parallel_ioport_read_sw(s, (addr - s->base) >> s->it_shift);
496 496
}
497 497

  
498
void parallel_mm_writel (void *opaque,
499
                       target_phys_addr_t addr, uint32_t value)
498
static void parallel_mm_writel (void *opaque,
499
                                target_phys_addr_t addr, uint32_t value)
500 500
{
501 501
    ParallelState *s = opaque;
502 502

  
b/hw/pc.c
317 317
/***********************************************************/
318 318
/* Bochs BIOS debug ports */
319 319

  
320
void bochs_bios_write(void *opaque, uint32_t addr, uint32_t val)
320
static void bochs_bios_write(void *opaque, uint32_t addr, uint32_t val)
321 321
{
322 322
    static const char shutdown_str[8] = "Shutdown";
323 323
    static int shutdown_index = 0;
......
361 361
    }
362 362
}
363 363

  
364
void bochs_bios_init(void)
364
static void bochs_bios_init(void)
365 365
{
366 366
    register_ioport_write(0x400, 1, 2, bochs_bios_write, NULL);
367 367
    register_ioport_write(0x401, 1, 2, bochs_bios_write, NULL);
......
431 431
    bdrv_set_boot_sector(bs_table[0], bootsect, sizeof(bootsect));
432 432
}
433 433

  
434
int load_kernel(const char *filename, uint8_t *addr,
435
                uint8_t *real_addr)
434
static int load_kernel(const char *filename, uint8_t *addr,
435
                       uint8_t *real_addr)
436 436
{
437 437
    int fd, size;
438 438
    int setup_sects;
b/hw/pci.c
65 65
    return bus;
66 66
}
67 67

  
68
PCIBus *pci_register_secondary_bus(PCIDevice *dev, pci_map_irq_fn map_irq)
68
static PCIBus *pci_register_secondary_bus(PCIDevice *dev, pci_map_irq_fn map_irq)
69 69
{
70 70
    PCIBus *bus;
71 71
    bus = qemu_mallocz(sizeof(PCIBus));
......
159 159
    *(uint32_t *)(pci_dev->config + addr) = cpu_to_le32(type);
160 160
}
161 161

  
162
target_phys_addr_t pci_to_cpu_addr(target_phys_addr_t addr)
162
static target_phys_addr_t pci_to_cpu_addr(target_phys_addr_t addr)
163 163
{
164 164
    return addr + pci_mem_base;
165 165
}
......
606 606
    PCIBus *bus;
607 607
} PCIBridge;
608 608

  
609
void pci_bridge_write_config(PCIDevice *d,
609
static void pci_bridge_write_config(PCIDevice *d,
610 610
                             uint32_t address, uint32_t val, int len)
611 611
{
612 612
    PCIBridge *s = (PCIBridge *)d;
b/hw/pckbd.c
290 290
    return ps2_read_data(s->kbd);
291 291
}
292 292

  
293
void kbd_write_data(void *opaque, uint32_t addr, uint32_t val)
293
static void kbd_write_data(void *opaque, uint32_t addr, uint32_t val)
294 294
{
295 295
    KBDState *s = opaque;
296 296

  
......
385 385
}
386 386

  
387 387
/* Memory mapped interface */
388
uint32_t kbd_mm_readb (void *opaque, target_phys_addr_t addr)
388
static uint32_t kbd_mm_readb (void *opaque, target_phys_addr_t addr)
389 389
{
390 390
    KBDState *s = opaque;
391 391

  
......
399 399
    }
400 400
}
401 401

  
402
void kbd_mm_writeb (void *opaque, target_phys_addr_t addr, uint32_t value)
402
static void kbd_mm_writeb (void *opaque, target_phys_addr_t addr, uint32_t value)
403 403
{
404 404
    KBDState *s = opaque;
405 405

  
b/hw/piix_pci.c
314 314
    return pci_device_load(d, f);
315 315
}
316 316

  
317
int piix_init(PCIBus *bus, int devfn)
317
static int piix_init(PCIBus *bus, int devfn)
318 318
{
319 319
    PCIDevice *d;
320 320
    uint8_t *pci_conf;
b/hw/pl061.c
209 209
  s->cr = 0xff;
210 210
}
211 211

  
212
void pl061_set_irq(void * opaque, int irq, int level)
212
static void pl061_set_irq(void * opaque, int irq, int level)
213 213
{
214 214
    pl061_state *s = (pl061_state *)opaque;
215 215
    uint8_t mask;
b/hw/pl190.c
216 216
   pl190_write
217 217
};
218 218

  
219
void pl190_reset(pl190_state *s)
219
static void pl190_reset(pl190_state *s)
220 220
{
221 221
  int i;
222 222

  
b/hw/pxa2xx_lcd.c
882 882
    /* TODO */
883 883
}
884 884

  
885
void pxa2xx_lcdc_orientation(void *opaque, int angle)
885
static void pxa2xx_lcdc_orientation(void *opaque, int angle)
886 886
{
887 887
    struct pxa2xx_lcdc_s *s = (struct pxa2xx_lcdc_s *) opaque;
888 888

  
b/hw/pxa2xx_pcmcia.c
9 9

  
10 10
#include "hw.h"
11 11
#include "pcmcia.h"
12
#include "pxa.h"
12 13

  
13 14
struct pxa2xx_pcmcia_s {
14 15
    struct pcmcia_socket_s slot;
b/hw/realview_gic.c
8 8
 */
9 9

  
10 10
#include "hw.h"
11
#include "arm-misc.h"
11
#include "primecell.h"
12 12

  
13 13
#define GIC_NIRQ 96
14 14
#define NCPU 1
b/hw/rtl8139.c
497 497

  
498 498
} RTL8139State;
499 499

  
500
void prom9346_decode_command(EEprom9346 *eeprom, uint8_t command)
500
static void prom9346_decode_command(EEprom9346 *eeprom, uint8_t command)
501 501
{
502 502
    DEBUG_PRINT(("RTL8139: eeprom command 0x%02x\n", command));
503 503

  
......
543 543
    }
544 544
}
545 545

  
546
void prom9346_shift_clock(EEprom9346 *eeprom)
546
static void prom9346_shift_clock(EEprom9346 *eeprom)
547 547
{
548 548
    int bit = eeprom->eedi?1:0;
549 549

  
......
635 635
    }
636 636
}
637 637

  
638
int prom9346_get_wire(RTL8139State *s)
638
static int prom9346_get_wire(RTL8139State *s)
639 639
{
640 640
    EEprom9346 *eeprom = &s->eeprom;
641 641
    if (!eeprom->eecs)
......
644 644
    return eeprom->eedo;
645 645
}
646 646

  
647
void prom9346_set_wire(RTL8139State *s, int eecs, int eesk, int eedi)
647
/* FIXME: This should be merged into/replaced by eeprom93xx.c.  */
648
static void prom9346_set_wire(RTL8139State *s, int eecs, int eesk, int eedi)
648 649
{
649 650
    EEprom9346 *eeprom = &s->eeprom;
650 651
    uint8_t old_eecs = eeprom->eecs;
......
1448 1449
    return ret;
1449 1450
}
1450 1451

  
1451
int rtl8139_config_writeable(RTL8139State *s)
1452
static int rtl8139_config_writeable(RTL8139State *s)
1452 1453
{
1453 1454
    if (s->Cfg9346 & Cfg9346_Unlock)
1454 1455
    {
b/hw/sd.c
308 308
    return sd_crc7(buffer, 5) != req->crc;	/* TODO */
309 309
}
310 310

  
311
void sd_response_r1_make(SDState *sd,
312
                         uint8_t *response, uint32_t last_status)
311
static void sd_response_r1_make(SDState *sd,
312
                                uint8_t *response, uint32_t last_status)
313 313
{
314 314
    uint32_t mask = CARD_STATUS_B ^ ILLEGAL_COMMAND;
315 315
    uint32_t status;
......
323 323
    response[3] = (status >> 0) & 0xff;
324 324
}
325 325

  
326
void sd_response_r3_make(SDState *sd, uint8_t *response)
326
static void sd_response_r3_make(SDState *sd, uint8_t *response)
327 327
{
328 328
    response[0] = (sd->ocr >> 24) & 0xff;
329 329
    response[1] = (sd->ocr >> 16) & 0xff;
......
331 331
    response[3] = (sd->ocr >> 0) & 0xff;
332 332
}
333 333

  
334
void sd_response_r6_make(SDState *sd, uint8_t *response)
334
static void sd_response_r6_make(SDState *sd, uint8_t *response)
335 335
{
336 336
    uint16_t arg;
337 337
    uint16_t status;
b/hw/sh_serial.c
252 252
        sh_serial_receive_break(s);
253 253
}
254 254

  
255
uint32_t sh_serial_read (void *opaque, target_phys_addr_t addr)
255
static uint32_t sh_serial_read (void *opaque, target_phys_addr_t addr)
256 256
{
257 257
    sh_serial_state *s = opaque;
258 258
    return sh_serial_ioport_read(s, addr - s->base);
259 259
}
260 260

  
261
void sh_serial_write (void *opaque,
262
		      target_phys_addr_t addr, uint32_t value)
261
static void sh_serial_write (void *opaque,
262
                             target_phys_addr_t addr, uint32_t value)
263 263
{
264 264
    sh_serial_state *s = opaque;
265 265
    sh_serial_ioport_write(s, addr - s->base, value);
b/hw/sh_timer.c
52 52
#endif
53 53
}
54 54

  
55
uint32_t sh_timer_read(void *opaque, target_phys_addr_t offset)
55
static uint32_t sh_timer_read(void *opaque, target_phys_addr_t offset)
56 56
{
57 57
    sh_timer_state *s = (sh_timer_state *)opaque;
58 58

  
b/hw/smbus.c
61 61
    }
62 62
}
63 63

  
64
void smbus_i2c_event(i2c_slave *s, enum i2c_event event)
64
static void smbus_i2c_event(i2c_slave *s, enum i2c_event event)
65 65
{
66 66
    SMBusDevice *dev = (SMBusDevice *)s;
67 67
    switch (event) {
b/hw/stellaris.c
521 521
   ssys_write
522 522
};
523 523

  
524
void ssys_reset(void *opaque)
524
static void ssys_reset(void *opaque)
525 525
{
526 526
    ssys_state *s = (ssys_state *)opaque;
527 527

  
b/hw/usb-ohci.c
31 31
#include "qemu-timer.h"
32 32
#include "usb.h"
33 33
#include "pci.h"
34
#include "pxa.h"
34 35

  
35 36
//#define DEBUG_OHCI
36 37
/* Dump packet contents.  */
b/hw/wm8750.c
124 124
    {  192, 88200,  128, 88200 },	/* SR: 11111 */
125 125
};
126 126

  
127
void wm8750_set_format(struct wm8750_s *s)
127
static void wm8750_set_format(struct wm8750_s *s)
128 128
{
129 129
    int i;
130 130
    audsettings_t in_fmt;
......
194 194
        AUD_set_active_out(*s->out[0], 1);
195 195
}
196 196

  
197
void inline wm8750_mask_update(struct wm8750_s *s)
197
static void inline wm8750_mask_update(struct wm8750_s *s)
198 198
{
199 199
#define R_ONLY	0x0000ffff
200 200
#define L_ONLY	0xffff0000
......
596 596
    return &s->i2c;
597 597
}
598 598

  
599
void wm8750_fini(i2c_slave *i2c)
599
static void wm8750_fini(i2c_slave *i2c)
600 600
{
601 601
    struct wm8750_s *s = (struct wm8750_s *) i2c;
602 602
    wm8750_reset(&s->i2c);
b/i386-dis.c
1838 1838
static char separator_char;
1839 1839
static char scale_char;
1840 1840

  
1841
/* Here for backwards compatibility.  When gdb stops using
1842
   print_insn_i386_att and print_insn_i386_intel these functions can
1843
   disappear, and print_insn_i386 be merged into print_insn.  */
1844
int
1845
print_insn_i386_att (pc, info)
1846
     bfd_vma pc;
1847
     disassemble_info *info;
1848
{
1849
  intel_syntax = 0;
1850

  
1851
  return print_insn (pc, info);
1852
}
1853

  
1854
int
1855
print_insn_i386_intel (pc, info)
1856
     bfd_vma pc;
1857
     disassemble_info *info;
1858
{
1859
  intel_syntax = 1;
1860

  
1861
  return print_insn (pc, info);
1862
}
1863

  
1864 1841
int
1865 1842
print_insn_i386 (pc, info)
1866 1843
     bfd_vma pc;
b/loader.c
23 23
 */
24 24
#include "qemu-common.h"
25 25
#include "disas.h"
26
#include "sysemu.h"
26 27
#include "uboot_image.h"
27 28

  
28 29
/* return the size or -1 if error */
b/monitor.c
261 261
}
262 262

  
263 263
/* get the current CPU defined by the user */
264
int mon_set_cpu(int cpu_index)
264
static int mon_set_cpu(int cpu_index)
265 265
{
266 266
    CPUState *env;
267 267

  
......
274 274
    return -1;
275 275
}
276 276

  
277
CPUState *mon_get_cpu(void)
277
static CPUState *mon_get_cpu(void)
278 278
{
279 279
    if (!mon_cpu) {
280 280
        mon_set_cpu(0);
b/osdep.c
82 82
#include <sys/mman.h>
83 83
#include <fcntl.h>
84 84

  
85
void *kqemu_vmalloc(size_t size)
85
static void *kqemu_vmalloc(size_t size)
86 86
{
87 87
    static int phys_ram_fd = -1;
88 88
    static int phys_ram_size = 0;
......
164 164
    return ptr;
165 165
}
166 166

  
167
void kqemu_vfree(void *ptr)
167
static void kqemu_vfree(void *ptr)
168 168
{
169 169
    /* may be useful some day, but currently we do not need to free */
170 170
}
b/qemu-char.h
46 46
};
47 47

  
48 48
CharDriverState *qemu_chr_open(const char *filename);
49
void qemu_chr_close(CharDriverState *chr);
49 50
void qemu_chr_printf(CharDriverState *s, const char *fmt, ...);
50 51
int qemu_chr_write(CharDriverState *s, const uint8_t *buf, int len);
51 52
void qemu_chr_send_event(CharDriverState *s, int event);
b/target-i386/helper.c
1235 1235
 * needed. It should only be called, if this is not an interrupt.
1236 1236
 * Returns the new exception number.
1237 1237
 */
1238
int check_exception(int intno, int *error_code)
1238
static int check_exception(int intno, int *error_code)
1239 1239
{
1240 1240
    char first_contributory = env->old_exception == 0 ||
1241 1241
                              (env->old_exception >= 10 &&
......
3051 3051
    helper_fstt(ST0, A0);
3052 3052
}
3053 3053

  
3054
void fpu_set_exception(int mask)
3054
static void fpu_set_exception(int mask)
3055 3055
{
3056 3056
    env->fpus |= mask;
3057 3057
    if (env->fpus & (~env->fpuc & FPUC_EM))
b/translate-op.c
33 33
};
34 34

  
35 35
#include "dyngen.h"
36
extern int dyngen_code(uint8_t *gen_code_buf,
37
                       uint16_t *label_offsets, uint16_t *jmp_offsets,
38
                       const uint16_t *opc_buf, const uint32_t *opparam_buf, const long *gen_labels);
36 39
#include "op.h"
37 40

  
b/usb-linux.c
907 907
    return p->class_name;
908 908
}
909 909

  
910
void usb_info_device(int bus_num, int addr, int class_id,
911
                     int vendor_id, int product_id,
912
                     const char *product_name,
913
                     int speed)
910
static void usb_info_device(int bus_num, int addr, int class_id,
911
                            int vendor_id, int product_id,
912
                            const char *product_name,
913
                            int speed)
914 914
{
915 915
    const char *class_str, *speed_str;
916 916

  
b/vl.c
242 242
target_phys_addr_t isa_mem_base = 0;
243 243
PicState2 *isa_pic;
244 244

  
245
uint32_t default_ioport_readb(void *opaque, uint32_t address)
245
static uint32_t default_ioport_readb(void *opaque, uint32_t address)
246 246
{
247 247
#ifdef DEBUG_UNUSED_IOPORT
248 248
    fprintf(stderr, "unused inb: port=0x%04x\n", address);
......
250 250
    return 0xff;
251 251
}
252 252

  
253
void default_ioport_writeb(void *opaque, uint32_t address, uint32_t data)
253
static void default_ioport_writeb(void *opaque, uint32_t address, uint32_t data)
254 254
{
255 255
#ifdef DEBUG_UNUSED_IOPORT
256 256
    fprintf(stderr, "unused outb: port=0x%04x data=0x%02x\n", address, data);
......
258 258
}
259 259

  
260 260
/* default is to make two byte accesses */
261
uint32_t default_ioport_readw(void *opaque, uint32_t address)
261
static uint32_t default_ioport_readw(void *opaque, uint32_t address)
262 262
{
263 263
    uint32_t data;
264 264
    data = ioport_read_table[0][address](ioport_opaque[address], address);
......
267 267
    return data;
268 268
}
269 269

  
270
void default_ioport_writew(void *opaque, uint32_t address, uint32_t data)
270
static void default_ioport_writew(void *opaque, uint32_t address, uint32_t data)
271 271
{
272 272
    ioport_write_table[0][address](ioport_opaque[address], address, data & 0xff);
273 273
    address = (address + 1) & (MAX_IOPORTS - 1);
274 274
    ioport_write_table[0][address](ioport_opaque[address], address, (data >> 8) & 0xff);
275 275
}
276 276

  
277
uint32_t default_ioport_readl(void *opaque, uint32_t address)
277
static uint32_t default_ioport_readl(void *opaque, uint32_t address)
278 278
{
279 279
#ifdef DEBUG_UNUSED_IOPORT
280 280
    fprintf(stderr, "unused inl: port=0x%04x\n", address);
......
282 282
    return 0xffffffff;
283 283
}
284 284

  
285
void default_ioport_writel(void *opaque, uint32_t address, uint32_t data)
285
static void default_ioport_writel(void *opaque, uint32_t address, uint32_t data)
286 286
{
287 287
#ifdef DEBUG_UNUSED_IOPORT
288 288
    fprintf(stderr, "unused outl: port=0x%04x data=0x%02x\n", address, data);
289 289
#endif
290 290
}
291 291

  
292
void init_ioports(void)
292
static void init_ioports(void)
293 293
{
294 294
    int i;
295 295

  
......
961 961

  
962 962
static QEMUTimer *active_timers[2];
963 963

  
964
QEMUClock *qemu_new_clock(int type)
964
static QEMUClock *qemu_new_clock(int type)
965 965
{
966 966
    QEMUClock *clock;
967 967
    clock = qemu_mallocz(sizeof(QEMUClock));
......
1539 1539
    alarm_timer = t;
1540 1540
}
1541 1541

  
1542
void quit_timers(void)
1542
static void quit_timers(void)
1543 1543
{
1544 1544
    alarm_timer->stop(alarm_timer);
1545 1545
    alarm_timer = NULL;
......
1832 1832
    d->mux_cnt++;
1833 1833
}
1834 1834

  
1835
CharDriverState *qemu_chr_open_mux(CharDriverState *drv)
1835
static CharDriverState *qemu_chr_open_mux(CharDriverState *drv)
1836 1836
{
1837 1837
    CharDriverState *chr;
1838 1838
    MuxDriver *d;
......
3385 3385
/***********************************************************/
3386 3386
/* network device redirectors */
3387 3387

  
3388
void hex_dump(FILE *f, const uint8_t *buf, int size)
3388
static void hex_dump(FILE *f, const uint8_t *buf, int size)
3389 3389
{
3390 3390
    int len, i, j, c;
3391 3391

  
......
3733 3733
}
3734 3734

  
3735 3735
/* automatic user mode samba server configuration */
3736
void net_slirp_smb(const char *exported_dir)
3736
static void net_slirp_smb(const char *exported_dir)
3737 3737
{
3738 3738
    char smb_conf[1024];
3739 3739
    char smb_cmdline[1024];
......
5127 5127
    return NULL;
5128 5128
}
5129 5129

  
5130
QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int64_t offset, int is_writable)
5130
static QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int64_t offset, int is_writable)
5131 5131
{
5132 5132
    QEMUFile *f;
5133 5133

  
......
5361 5361
#define QEMU_VM_FILE_MAGIC   0x5145564d
5362 5362
#define QEMU_VM_FILE_VERSION 0x00000002
5363 5363

  
5364
int qemu_savevm_state(QEMUFile *f)
5364
static int qemu_savevm_state(QEMUFile *f)
5365 5365
{
5366 5366
    SaveStateEntry *se;
5367 5367
    int len, ret;
......
5384 5384
        /* record size: filled later */
5385 5385
        len_pos = qemu_ftell(f);
5386 5386
        qemu_put_be32(f, 0);
5387

  
5388 5387
        se->save_state(f, se->opaque);
5389 5388

  
5390 5389
        /* fill record size */
......
5415 5414
    return NULL;
5416 5415
}
5417 5416

  
5418
int qemu_loadvm_state(QEMUFile *f)
5417
static int qemu_loadvm_state(QEMUFile *f)
5419 5418
{
5420 5419
    SaveStateEntry *se;
5421 5420
    int len, ret, instance_id, record_len, version_id;
......
6655 6654
    return 0;
6656 6655
}
6657 6656

  
6658
QEMUMachine *find_machine(const char *name)
6657
static QEMUMachine *find_machine(const char *name)
6659 6658
{
6660 6659
    QEMUMachine *m;
6661 6660

  
......
6669 6668
/***********************************************************/
6670 6669
/* main execution loop */
6671 6670

  
6672
void gui_update(void *opaque)
6671
static void gui_update(void *opaque)
6673 6672
{
6674 6673
    DisplayState *ds = opaque;
6675 6674
    ds->dpy_refresh(ds);
......
6953 6952

  
6954 6953
static CPUState *cur_cpu;
6955 6954

  
6956
int main_loop(void)
6955
static int main_loop(void)
6957 6956
{
6958 6957
    int ret, timeout;
6959 6958
#ifdef CONFIG_PROFILER
......
7414 7413
}
7415 7414

  
7416 7415
/* XXX: currently we cannot use simultaneously different CPUs */
7417
void register_machines(void)
7416
static void register_machines(void)
7418 7417
{
7419 7418
#if defined(TARGET_I386)
7420 7419
    qemu_register_machine(&pc_machine);
b/vnc.c
812 812
}
813 813

  
814 814
#if CONFIG_VNC_TLS
815
ssize_t vnc_tls_push(gnutls_transport_ptr_t transport,
816
		     const void *data,
817
		     size_t len) {
815
static ssize_t vnc_tls_push(gnutls_transport_ptr_t transport,
816
                            const void *data,
817
                            size_t len) {
818 818
    struct VncState *vs = (struct VncState *)transport;
819 819
    int ret;
820 820

  
......
829 829
}
830 830

  
831 831

  
832
ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport,
833
		     void *data,
834
		     size_t len) {
832
static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport,
833
                            void *data,
834
                            size_t len) {
835 835
    struct VncState *vs = (struct VncState *)transport;
836 836
    int ret;
837 837

  
b/x_keymap.c
22 22
 * THE SOFTWARE.
23 23
 */
24 24
#include "qemu-common.h"
25
#include "console.h"
25 26

  
26 27
static const uint8_t x_keycode_to_pc_keycode[115] = {
27 28
   0xc7,      /*  97  Home   */

Also available in: Unified diff