Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

software/libnet/microudp: rearrange send_packet, add comments and remove txlen padding

This commit is contained in:
Florent Kermarrec 2019-04-24 11:32:40 +02:00
parent 44e0cdda9a
commit e8f3c49127
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
litex/soc/software/libnet/microudp.c
View File

@ -114,14 +114,20 @@ typedef union {
unsigned char raw[ETHMAC_SLOT_SIZE]; unsigned char raw[ETHMAC_SLOT_SIZE];
} ethernet_buffer; } ethernet_buffer;
static unsigned int rxslot;
static unsigned int rxlen; static unsigned int rxlen;
static ethernet_buffer *rxbuffer; static ethernet_buffer *rxbuffer;
static unsigned int txslot;
static unsigned int txlen; static unsigned int txlen;
static ethernet_buffer *txbuffer; static ethernet_buffer *txbuffer;
static void send_packet(void) static void send_packet(void)
{ {
unsigned int txslot; /* wait buffer to be available */
while(!(ethmac_sram_reader_ready_read()));
/* fill txbuffer */
#ifndef HW_PREAMBLE_CRC #ifndef HW_PREAMBLE_CRC
unsigned int crc; unsigned int crc;
crc = crc32(&txbuffer->raw[8], txlen-8); crc = crc32(&txbuffer->raw[8], txlen-8);
@ -131,7 +137,6 @@ static void send_packet(void)
txbuffer->raw[txlen+3] = (crc & 0xff000000) >> 24; txbuffer->raw[txlen+3] = (crc & 0xff000000) >> 24;
txlen += 4; txlen += 4;
#endif #endif
txlen += 4; //FIXME: padding?
#ifdef DEBUG_MICROUDP_TX #ifdef DEBUG_MICROUDP_TX
int j; int j;
@ -141,13 +146,14 @@ static void send_packet(void)
printf("\n"); printf("\n");
#endif #endif
/* fill slot, length and send */
ethmac_sram_reader_slot_write(txslot);
ethmac_sram_reader_length_write(txlen); ethmac_sram_reader_length_write(txlen);
ethmac_sram_reader_start_write(1); ethmac_sram_reader_start_write(1);
while(!(ethmac_sram_reader_ready_read()));
txslot = ethmac_sram_reader_slot_read(); /* update txslot / txbuffer */
txbuffer = (ethernet_buffer *)(ETHMAC_BASE + ETHMAC_SLOT_SIZE * (ETHMAC_RX_SLOTS + txslot));
txslot = (txslot+1)%ETHMAC_TX_SLOTS; txslot = (txslot+1)%ETHMAC_TX_SLOTS;
ethmac_sram_reader_slot_write(txslot); txbuffer = (ethernet_buffer *)(ETHMAC_BASE + ETHMAC_SLOT_SIZE * (ETHMAC_RX_SLOTS + txslot));
} }
static unsigned char my_mac[6]; static unsigned char my_mac[6];
@ -415,17 +421,17 @@ void microudp_start(const unsigned char *macaddr, unsigned int ip)
for(i=0;i<6;i++) for(i=0;i<6;i++)
cached_mac[i] = 0; cached_mac[i] = 0;
ethmac_sram_reader_slot_write(0); txslot = 0;
txbuffer = (ethernet_buffer *)(ETHMAC_BASE + ETHMAC_SLOT_SIZE * ETHMAC_RX_SLOTS); ethmac_sram_reader_slot_write(txslot);
txbuffer = (ethernet_buffer *)(ETHMAC_BASE + ETHMAC_SLOT_SIZE * (ETHMAC_RX_SLOTS + txslot));
rxslot = 0;
rxbuffer = (ethernet_buffer *)ETHMAC_BASE; rxbuffer = (ethernet_buffer *)(ETHMAC_BASE + ETHMAC_SLOT_SIZE * rxslot);
rx_callback = (udp_callback)0; rx_callback = (udp_callback)0;
} }
void microudp_service(void) void microudp_service(void)
{ {
unsigned int rxslot;
if(ethmac_sram_writer_ev_pending_read() & ETHMAC_EV_SRAM_WRITER) { if(ethmac_sram_writer_ev_pending_read() & ETHMAC_EV_SRAM_WRITER) {
rxslot = ethmac_sram_writer_slot_read(); rxslot = ethmac_sram_writer_slot_read();
rxbuffer = (ethernet_buffer *)(ETHMAC_BASE + ETHMAC_SLOT_SIZE * rxslot); rxbuffer = (ethernet_buffer *)(ETHMAC_BASE + ETHMAC_SLOT_SIZE * rxslot);