Commit 62a46c616811461fd06f6321a966c55d8a30c33a
1 parent
574bbf7b
suppressed warnings in 64 bit case
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1184 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
23 additions
and
7 deletions
hw/fdc.c
| @@ -95,9 +95,14 @@ typedef struct fdrive_t { | @@ -95,9 +95,14 @@ typedef struct fdrive_t { | ||
| 95 | } fdrive_t; | 95 | } fdrive_t; |
| 96 | 96 | ||
| 97 | #ifdef TARGET_SPARC | 97 | #ifdef TARGET_SPARC |
| 98 | +/* XXX: suppress those hacks */ | ||
| 98 | #define DMA_read_memory(a,b,c,d) | 99 | #define DMA_read_memory(a,b,c,d) |
| 99 | #define DMA_write_memory(a,b,c,d) | 100 | #define DMA_write_memory(a,b,c,d) |
| 100 | -#define DMA_register_channel(a,b,c) | 101 | +void DMA_register_channel (int nchan, |
| 102 | + DMA_transfer_handler transfer_handler, | ||
| 103 | + void *opaque) | ||
| 104 | +{ | ||
| 105 | +} | ||
| 101 | #define DMA_hold_DREQ(a) | 106 | #define DMA_hold_DREQ(a) |
| 102 | #define DMA_release_DREQ(a) | 107 | #define DMA_release_DREQ(a) |
| 103 | #define DMA_get_channel_mode(a) (0) | 108 | #define DMA_get_channel_mode(a) (0) |
| @@ -469,16 +474,27 @@ static void fdctrl_write (void *opaque, uint32_t reg, uint32_t value) | @@ -469,16 +474,27 @@ static void fdctrl_write (void *opaque, uint32_t reg, uint32_t value) | ||
| 469 | } | 474 | } |
| 470 | } | 475 | } |
| 471 | 476 | ||
| 477 | +static uint32_t fdctrl_read_mem (void *opaque, target_phys_addr_t reg) | ||
| 478 | +{ | ||
| 479 | + return fdctrl_read(opaque, reg); | ||
| 480 | +} | ||
| 481 | + | ||
| 482 | +static void fdctrl_write_mem (void *opaque, | ||
| 483 | + target_phys_addr_t reg, uint32_t value) | ||
| 484 | +{ | ||
| 485 | + fdctrl_write(opaque, reg, value); | ||
| 486 | +} | ||
| 487 | + | ||
| 472 | static CPUReadMemoryFunc *fdctrl_mem_read[3] = { | 488 | static CPUReadMemoryFunc *fdctrl_mem_read[3] = { |
| 473 | - fdctrl_read, | ||
| 474 | - fdctrl_read, | ||
| 475 | - fdctrl_read, | 489 | + fdctrl_read_mem, |
| 490 | + fdctrl_read_mem, | ||
| 491 | + fdctrl_read_mem, | ||
| 476 | }; | 492 | }; |
| 477 | 493 | ||
| 478 | static CPUWriteMemoryFunc *fdctrl_mem_write[3] = { | 494 | static CPUWriteMemoryFunc *fdctrl_mem_write[3] = { |
| 479 | - fdctrl_write, | ||
| 480 | - fdctrl_write, | ||
| 481 | - fdctrl_write, | 495 | + fdctrl_write_mem, |
| 496 | + fdctrl_write_mem, | ||
| 497 | + fdctrl_write_mem, | ||
| 482 | }; | 498 | }; |
| 483 | 499 | ||
| 484 | static void fd_change_cb (void *opaque) | 500 | static void fd_change_cb (void *opaque) |