software/libnet: remove use of ethmac_mem.h

This commit is contained in:
Florent Kermarrec 2019-04-12 17:08:29 +02:00
parent c7ac96761c
commit 1569e2e0cf
2 changed files with 6 additions and 16 deletions

View File

@ -1,11 +0,0 @@
#ifndef __HW_ETHMAC_MEM_H
#define __HW_ETHMAC_MEM_H
#include <generated/mem.h>
#define ETHMAC_RX0_BASE ETHMAC_BASE
#define ETHMAC_RX1_BASE (ETHMAC_BASE+0x0800)
#define ETHMAC_TX0_BASE (ETHMAC_BASE+0x1000)
#define ETHMAC_TX1_BASE (ETHMAC_BASE+0x1800)
#endif

View File

@ -1,4 +1,6 @@
#include <generated/csr.h> #include <generated/csr.h>
#include <generated/mem.h>
#ifdef CSR_ETHMAC_BASE #ifdef CSR_ETHMAC_BASE
#include <stdio.h> #include <stdio.h>
@ -6,7 +8,6 @@
#include <system.h> #include <system.h>
#include <crc.h> #include <crc.h>
#include <hw/flags.h> #include <hw/flags.h>
#include <hw/ethmac_mem.h>
#include <net/microudp.h> #include <net/microudp.h>
@ -415,10 +416,10 @@ void microudp_start(const unsigned char *macaddr, unsigned int ip)
ethmac_sram_reader_ev_pending_write(ETHMAC_EV_SRAM_READER); ethmac_sram_reader_ev_pending_write(ETHMAC_EV_SRAM_READER);
ethmac_sram_writer_ev_pending_write(ETHMAC_EV_SRAM_WRITER); ethmac_sram_writer_ev_pending_write(ETHMAC_EV_SRAM_WRITER);
rxbuffer0 = (ethernet_buffer *)ETHMAC_RX0_BASE; rxbuffer0 = (ethernet_buffer *)(ETHMAC_BASE + 0*ETHMAC_SLOT_SIZE);
rxbuffer1 = (ethernet_buffer *)ETHMAC_RX1_BASE; rxbuffer1 = (ethernet_buffer *)(ETHMAC_BASE + 1*ETHMAC_SLOT_SIZE);
txbuffer0 = (ethernet_buffer *)ETHMAC_TX0_BASE; txbuffer0 = (ethernet_buffer *)(ETHMAC_BASE + 2*ETHMAC_SLOT_SIZE);
txbuffer1 = (ethernet_buffer *)ETHMAC_TX1_BASE; txbuffer1 = (ethernet_buffer *)(ETHMAC_BASE + 3*ETHMAC_SLOT_SIZE);
rxslot = 0; rxslot = 0;
txslot = 0; txslot = 0;