srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

runtime: link against lwip, cleanups

This commit is contained in:
Sebastien Bourdeauducq 2015-04-17 16:38:46 +08:00
parent 91cd79a8a3
commit 4c6387929b
3 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
soc/runtime/Makefile
View File

@ -40,7 +40,8 @@ runtime.elf: $(OBJECTS) libs
$(OBJECTS) \ $(OBJECTS) \
-L$(MSCDIR)/software/libbase \ -L$(MSCDIR)/software/libbase \
-L$(MSCDIR)/software/libcompiler-rt \ -L$(MSCDIR)/software/libcompiler-rt \
-lbase -lcompiler-rt -Lliblwip \
-lbase -lcompiler-rt -llwip
@chmod -x $@ @chmod -x $@
ksupport.elf: $(OBJECTS_KSUPPORT) ksupport.elf: $(OBJECTS_KSUPPORT)
@ -71,8 +72,10 @@ main.o: main.c
libs: libs:
$(MAKE) -C $(MSCDIR)/software/libcompiler-rt $(MAKE) -C $(MSCDIR)/software/libcompiler-rt
$(MAKE) -C $(MSCDIR)/software/libbase $(MAKE) -C $(MSCDIR)/software/libbase
$(MAKE) -C liblwip
clean: clean:
$(MAKE) -C liblwip clean
$(RM) $(OBJECTS) $(OBJECTS:.o=.d) $(OBJECTS_KSUPPORT) $(OBJECTS_KSUPPORT:.o=.d) $(RM) $(OBJECTS) $(OBJECTS:.o=.d) $(OBJECTS_KSUPPORT) $(OBJECTS_KSUPPORT:.o=.d)
$(RM) runtime.elf runtime.bin runtime.fbi .*~ *~ $(RM) runtime.elf runtime.bin runtime.fbi .*~ *~
$(RM) service_table.h ksupport.elf ksupport.bin $(RM) service_table.h ksupport.elf ksupport.bin

2
soc/runtime/liblwip/Makefile
View File

@ -32,7 +32,7 @@ CORE4OBJS=$(LWIPDIR)/core/ipv4/icmp.o \
NETIFOBJS=$(LWIPDIR)/netif/etharp.o \ NETIFOBJS=$(LWIPDIR)/netif/etharp.o \
netif/liteethif.o netif/liteethif.o
# NETIFOBJS: All the above. # LWIPOBJS: All the above.
LWIPOBJS=$(COREOBJS) $(CORE4OBJS) $(NETIFOBJS) LWIPOBJS=$(COREOBJS) $(CORE4OBJS) $(NETIFOBJS)
OBJS_LIB+=$(LWIPOBJS) OBJS_LIB+=$(LWIPOBJS)

19
soc/runtime/liblwip/netif/liteethif.c
View File

@ -53,8 +53,6 @@ static void liteeth_low_level_init(struct netif *netif)
rxbuffer = rxbuffer0; rxbuffer = rxbuffer0;
txbuffer = txbuffer0; txbuffer = txbuffer0;
return;
} }
static err_t liteeth_low_level_output(struct netif *netif, struct pbuf *p) static err_t liteeth_low_level_output(struct netif *netif, struct pbuf *p)
@ -70,11 +68,11 @@ static err_t liteeth_low_level_output(struct netif *netif, struct pbuf *p)
ethmac_sram_reader_slot_write(txslot); ethmac_sram_reader_slot_write(txslot);
ethmac_sram_reader_length_write(txlen); ethmac_sram_reader_length_write(txlen);
while(!(ethmac_sram_reader_ready_read())); while(!ethmac_sram_reader_ready_read());
ethmac_sram_reader_start_write(1); ethmac_sram_reader_start_write(1);
txslot = (txslot+1)%2; txslot = (txslot + 1) % 2;
if (txslot) if(txslot)
txbuffer = txbuffer1; txbuffer = txbuffer1;
else else
txbuffer = txbuffer0; txbuffer = txbuffer0;
@ -82,19 +80,19 @@ static err_t liteeth_low_level_output(struct netif *netif, struct pbuf *p)
return ERR_OK; return ERR_OK;
} }
static struct pbuf * liteeth_low_level_input(struct netif *netif) static struct pbuf *liteeth_low_level_input(struct netif *netif)
{ {
struct pbuf *p, *q; struct pbuf *p, *q;
rxslot = ethmac_sram_writer_slot_read(); rxslot = ethmac_sram_writer_slot_read();
rxlen = ethmac_sram_writer_length_read(); rxlen = ethmac_sram_writer_length_read();
if (rxslot) if(rxslot)
rxbuffer = rxbuffer1; rxbuffer = rxbuffer1;
else else
rxbuffer = rxbuffer0; rxbuffer = rxbuffer0;
p = pbuf_alloc(PBUF_RAW, rxlen, PBUF_POOL); p = pbuf_alloc(PBUF_RAW, rxlen, PBUF_POOL);
if (p != NULL) { if(p != NULL) {
for(q = p; q != NULL; q = q->next) { for(q = p; q != NULL; q = q->next) {
memcpy(q->payload, rxbuffer->raw, q->len); memcpy(q->payload, rxbuffer->raw, q->len);
rxbuffer += q->len; rxbuffer += q->len;
@ -108,9 +106,8 @@ void liteeth_input(struct netif *netif)
{ {
struct pbuf *p; struct pbuf *p;
p = liteeth_low_level_input(netif); p = liteeth_low_level_input(netif);
if (p != NULL) { if(p != NULL)
netif->input(p, netif); netif->input(p, netif);
}
} }
err_t liteeth_init(struct netif *netif) err_t liteeth_init(struct netif *netif)
@ -118,7 +115,7 @@ err_t liteeth_init(struct netif *netif)
struct liteethif *liteethif; struct liteethif *liteethif;
liteethif = mem_malloc(sizeof(struct liteethif)); liteethif = mem_malloc(sizeof(struct liteethif));
if (liteethif == NULL) if(liteethif == NULL)
return ERR_MEM; return ERR_MEM;
netif->state = liteethif; netif->state = liteethif;