motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-23 10:01:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

No functional changes: remove dead code and fix indentation & wrapping lines.

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3535 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
j_mayer 2007-11-05 03:11:37 +00:00
parent d8f699cb32
commit 4f43196097
1 changed files with 196 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hw/fdc.c
View file

@ -615,7 +615,8 @@ fdctrl_t *fdctrl_init (qemu_irq irq, int dma_chann, int mem_mapped,
fdctrl_reset(fdctrl, 0); fdctrl_reset(fdctrl, 0);
fdctrl->state = FD_CTRL_ACTIVE; fdctrl->state = FD_CTRL_ACTIVE;
if (mem_mapped) { if (mem_mapped) {
io_mem = cpu_register_io_memory(0, fdctrl_mem_read, fdctrl_mem_write, fdctrl); io_mem = cpu_register_io_memory(0, fdctrl_mem_read, fdctrl_mem_write,
fdctrl);
cpu_register_physical_memory(io_base, 0x08, io_mem); cpu_register_physical_memory(io_base, 0x08, io_mem);
} else { } else {
register_ioport_read((uint32_t)io_base + 0x01, 5, 1, &fdctrl_read, register_ioport_read((uint32_t)io_base + 0x01, 5, 1, &fdctrl_read,
@ -856,6 +857,7 @@ static void fdctrl_write_rate (fdctrl_t *fdctrl, uint32_t value)
static int fdctrl_media_changed(fdrive_t *drv) static int fdctrl_media_changed(fdrive_t *drv)
{ {
int ret; int ret;
if (!drv->bs) if (!drv->bs)
return 0; return 0;
ret = bdrv_media_changed(drv->bs); ret = bdrv_media_changed(drv->bs);
@ -1103,15 +1105,11 @@ static int fdctrl_transfer_handler (void *opaque, int nchan,
/* READ commands */ /* READ commands */
DMA_write_memory (nchan, fdctrl->fifo + rel_pos, DMA_write_memory (nchan, fdctrl->fifo + rel_pos,
fdctrl->data_pos, len); fdctrl->data_pos, len);
/* cpu_physical_memory_write(addr + fdctrl->data_pos, */
/* fdctrl->fifo + rel_pos, len); */
break; break;
case FD_DIR_WRITE: case FD_DIR_WRITE:
/* WRITE commands */ /* WRITE commands */
DMA_read_memory (nchan, fdctrl->fifo + rel_pos, DMA_read_memory (nchan, fdctrl->fifo + rel_pos,
fdctrl->data_pos, len); fdctrl->data_pos, len);
/* cpu_physical_memory_read(addr + fdctrl->data_pos, */
/* fdctrl->fifo + rel_pos, len); */
if (bdrv_write(cur_drv->bs, fd_sector(cur_drv), if (bdrv_write(cur_drv->bs, fd_sector(cur_drv),
fdctrl->fifo, 1) < 0) { fdctrl->fifo, 1) < 0) {
FLOPPY_ERROR("writting sector %d\n", fd_sector(cur_drv)); FLOPPY_ERROR("writting sector %d\n", fd_sector(cur_drv));
@ -1125,8 +1123,6 @@ static int fdctrl_transfer_handler (void *opaque, int nchan,
uint8_t tmpbuf[FD_SECTOR_LEN]; uint8_t tmpbuf[FD_SECTOR_LEN];
int ret; int ret;
DMA_read_memory (nchan, tmpbuf, fdctrl->data_pos, len); DMA_read_memory (nchan, tmpbuf, fdctrl->data_pos, len);
/* cpu_physical_memory_read(addr + fdctrl->data_pos, */
/* tmpbuf, len); */
ret = memcmp(tmpbuf, fdctrl->fifo + rel_pos, len); ret = memcmp(tmpbuf, fdctrl->fifo + rel_pos, len);
if (ret == 0) { if (ret == 0) {
status2 = 0x08; status2 = 0x08;
@ -1856,6 +1852,7 @@ static void fdctrl_result_timer(void *opaque)
{ {
fdctrl_t *fdctrl = opaque; fdctrl_t *fdctrl = opaque;
fdrive_t *cur_drv = get_cur_drv(fdctrl); fdrive_t *cur_drv = get_cur_drv(fdctrl);
/* Pretend we are spinning. /* Pretend we are spinning.
* This is needed for Coherent, which uses READ ID to check for * This is needed for Coherent, which uses READ ID to check for
* sector interleaving. * sector interleaving.