gwj / at91sam9263 · Commits

Commit 678fdca87a39eb7989b1c5ede0b1f36cfd3519b0

Authored by Edgar E. Iglesias
1 parent 340d96e7

etrax: Remove unused eth irq line. 

The ethernet blocks irq line to report errors is unimplemented in QEMU.
Remove it for now.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Inline Side-by-side
Showing 4 changed files with 6 additions and 10 deletions
hw/axis_dev88.c
  View file @678fdca
@@ -302,10 +302,9 @@ void axisdev88_init (ram_addr_t ram_size, @@ -302,10 +302,9 @@ void axisdev88_init (ram_addr_t ram_size,
302 } 302 }
303 303
304 /* Add the two ethernet blocks. */ 304 /* Add the two ethernet blocks. */
305 - eth[0] = etraxfs_eth_init(&nd_table[0], env, irq + 25, 0x30034000, 1); 305 + eth[0] = etraxfs_eth_init(&nd_table[0], env, 0x30034000, 1);
306 if (nb_nics > 1) 306 if (nb_nics > 1)
307 - eth[1] = etraxfs_eth_init(&nd_table[1], env,  
308 - irq + 26, 0x30036000, 2); 307 + eth[1] = etraxfs_eth_init(&nd_table[1], env, 0x30036000, 2);
309 308
310 /* The DMA Connector block is missing, hardwire things for now. */ 309 /* The DMA Connector block is missing, hardwire things for now. */
311 etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]); 310 etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]);
hw/etraxfs.c
  View file @678fdca
@@ -93,10 +93,9 @@ void bareetraxfs_init (ram_addr_t ram_size, @@ -93,10 +93,9 @@ void bareetraxfs_init (ram_addr_t ram_size,
93 } 93 }
94 94
95 /* Add the two ethernet blocks. */ 95 /* Add the two ethernet blocks. */
96 - eth[0] = etraxfs_eth_init(&nd_table[0], env, irq + 25, 0x30034000, 1); 96 + eth[0] = etraxfs_eth_init(&nd_table[0], env, 0x30034000, 1);
97 if (nb_nics > 1) 97 if (nb_nics > 1)
98 - eth[1] = etraxfs_eth_init(&nd_table[1], env,  
99 - irq + 26, 0x30036000, 2); 98 + eth[1] = etraxfs_eth_init(&nd_table[1], env, 0x30036000, 2);
100 99
101 /* The DMA Connector block is missing, hardwire things for now. */ 100 /* The DMA Connector block is missing, hardwire things for now. */
102 etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]); 101 etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]);
hw/etraxfs.h
  View file @678fdca
@@ -26,4 +26,4 @@ @@ -26,4 +26,4 @@
26 26
27 qemu_irq *etraxfs_pic_init(CPUState *env, target_phys_addr_t base); 27 qemu_irq *etraxfs_pic_init(CPUState *env, target_phys_addr_t base);
28 void *etraxfs_eth_init(NICInfo *nd, CPUState *env, 28 void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
29 - qemu_irq *irq, target_phys_addr_t base, int phyaddr); 29 + target_phys_addr_t base, int phyaddr);
hw/etraxfs_eth.c
  View file @678fdca
@@ -320,7 +320,6 @@ static void mdio_cycle(struct qemu_mdio *bus) @@ -320,7 +320,6 @@ static void mdio_cycle(struct qemu_mdio *bus)
320 struct fs_eth 320 struct fs_eth
321 { 321 {
322 CPUState *env; 322 CPUState *env;
323 - qemu_irq *irq;  
324 VLANClientState *vc; 323 VLANClientState *vc;
325 int ethregs; 324 int ethregs;
326 325
@@ -565,7 +564,7 @@ static void eth_cleanup(VLANClientState *vc) @@ -565,7 +564,7 @@ static void eth_cleanup(VLANClientState *vc)
565 } 564 }
566 565
567 void *etraxfs_eth_init(NICInfo *nd, CPUState *env, 566 void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
568 - qemu_irq *irq, target_phys_addr_t base, int phyaddr) 567 + target_phys_addr_t base, int phyaddr)
569 { 568 {
570 struct etraxfs_dma_client *dma = NULL; 569 struct etraxfs_dma_client *dma = NULL;
571 struct fs_eth *eth = NULL; 570 struct fs_eth *eth = NULL;
@@ -582,7 +581,6 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env, @@ -582,7 +581,6 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
582 dma[1].client.pull = NULL; 581 dma[1].client.pull = NULL;
583 582
584 eth->env = env; 583 eth->env = env;
585 - eth->irq = irq;  
586 eth->dma_out = dma; 584 eth->dma_out = dma;
587 eth->dma_in = dma + 1; 585 eth->dma_in = dma + 1;
588 586