gwj / at91sam9263 · Commits

Commit 30c4bbace19e802979009cc5c16fb4e14dc6bda6

Authored by ths
1 parent 9c2149c8

Fix DMA timeouts on FreeBSD, by Carlo Marcelo Arenas Belon. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2349 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
hw/ide.c
  View file @30c4bba
@@ -2230,7 +2230,6 @@ static void ide_dma_start(IDEState *s, BlockDriverCompletionFunc *dma_cb) @@ -2230,7 +2230,6 @@ static void ide_dma_start(IDEState *s, BlockDriverCompletionFunc *dma_cb)
2230 return; 2230 return;
2231 bm->ide_if = s; 2231 bm->ide_if = s;
2232 bm->dma_cb = dma_cb; 2232 bm->dma_cb = dma_cb;
2233 - bm->cur_addr = bm->addr;  
2234 bm->cur_prd_last = 0; 2233 bm->cur_prd_last = 0;
2235 bm->cur_prd_addr = 0; 2234 bm->cur_prd_addr = 0;
2236 bm->cur_prd_len = 0; 2235 bm->cur_prd_len = 0;
@@ -2363,6 +2362,7 @@ static void bmdma_addr_writel(void *opaque, uint32_t addr, uint32_t val) @@ -2363,6 +2362,7 @@ static void bmdma_addr_writel(void *opaque, uint32_t addr, uint32_t val)
2363 printf("%s: 0x%08x\n", __func__, val); 2362 printf("%s: 0x%08x\n", __func__, val);
2364 #endif 2363 #endif
2365 bm->addr = val & ~3; 2364 bm->addr = val & ~3;
  2365 + bm->cur_addr = bm->addr;
2366 } 2366 }
2367 2367
2368 static void bmdma_map(PCIDevice *pci_dev, int region_num, 2368 static void bmdma_map(PCIDevice *pci_dev, int region_num,