proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-16 02:40:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ETRAX: Connect both ethernet controllers.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4488 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
edgar_igl 2008-05-18 08:51:28 +00:00
parent f6953f1345
commit 4eeed608c5
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/etraxfs.c
View File

@ -60,7 +60,7 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
{ {
CPUState *env; CPUState *env;
qemu_irq *pic; qemu_irq *pic;
struct etraxfs_dma_client *eth0; struct etraxfs_dma_client *eth[2] = {NULL, NULL};
int kernel_size; int kernel_size;
int i; int i;
ram_addr_t phys_ram; ram_addr_t phys_ram;
@ -106,12 +106,18 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
etraxfs_dmac_connect(etraxfs_dmac, i, pic + 7 + i, i & 1); etraxfs_dmac_connect(etraxfs_dmac, i, pic + 7 + i, i & 1);
} }
/* It has 2, but let's start with one ethernet block. */ /* Add the two ethernet blocks. */
eth0 = etraxfs_eth_init(&nd_table[0], env, pic + 25, 0xb0034000); eth[0] = etraxfs_eth_init(&nd_table[0], env, pic + 25, 0xb0034000);
if (&nd_table[1])
eth[1] = etraxfs_eth_init(&nd_table[1], env, pic + 26, 0xb0036000);
/* The DMA Connector block is missing, hardwire things for now. */ /* The DMA Connector block is missing, hardwire things for now. */
etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth0); etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]);
etraxfs_dmac_connect_client(etraxfs_dmac, 1, eth0 + 1); etraxfs_dmac_connect_client(etraxfs_dmac, 1, eth[0] + 1);
if (eth[1]) {
etraxfs_dmac_connect_client(etraxfs_dmac, 6, eth[1]);
etraxfs_dmac_connect_client(etraxfs_dmac, 7, eth[1] + 1);
}
/* 2 timers. */ /* 2 timers. */
etraxfs_timer_init(env, pic + 0x1b, 0xb001e000); etraxfs_timer_init(env, pic + 0x1b, 0xb001e000);