jordan/rpi4-osdev
1
0
Fork 0
mirror of https://github.com/isometimes/rpi4-osdev synced 2024-11-22 10:10:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added some clocking to Ethernet over SPI example

Browse source
This commit is contained in:
Adam Greenwood-Byrne 2021-10-30 18:16:02 +01:00
parent bbe5d156b7
commit 29b864719c
3 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
part14-ethernet/kernel/arp.c
View file

@ -158,30 +158,29 @@ void arp_test(void)
debugcrlf(); debugcrlf();
while (1) { while (1) {
if (!ENC_GetReceivedFrame(&handle)) { while (!(handle.interruptFlags & EIR_PKTIF)) ENC_IRQHandler(&handle);
continue;
}
uint16_t len = handle.RxFrameInfos.length; debugstr("Got one... ");
ENC_GetReceivedFrame(&handle);
//uint16_t len = handle.RxFrameInfos.length;
uint8_t *buffer = (uint8_t *)handle.RxFrameInfos.buffer; uint8_t *buffer = (uint8_t *)handle.RxFrameInfos.buffer;
checkPacket = (ARP *)buffer; checkPacket = (ARP *)buffer;
if (len > 0) { if (!memcmp(checkPacket->senderIP, routerIP, 4)) {
if (!memcmp(checkPacket->senderIP, routerIP, 4)) { // Success! We have found our router's MAC address
// Success! We have found our router's MAC address
memcpy(routerMAC, checkPacket->senderMAC, 6); memcpy(routerMAC, checkPacket->senderMAC, 6);
debugstr("Router MAC is "); debugstr("Router MAC is ");
debughex(routerMAC[0]); debughex(routerMAC[0]);
debughex(routerMAC[1]); debughex(routerMAC[1]);
debughex(routerMAC[2]); debughex(routerMAC[2]);
debughex(routerMAC[3]); debughex(routerMAC[3]);
debughex(routerMAC[4]); debughex(routerMAC[4]);
debughex(routerMAC[5]); debughex(routerMAC[5]);
debugcrlf(); debugcrlf();
break; break;
}
} }
} }
} }
@ -191,11 +190,7 @@ void init_network(void)
handle.Init.DuplexMode = ETH_MODE_HALFDUPLEX; handle.Init.DuplexMode = ETH_MODE_HALFDUPLEX;
handle.Init.MACAddr = myMAC; handle.Init.MACAddr = myMAC;
handle.Init.ChecksumMode = ETH_CHECKSUM_BY_HARDWARE; handle.Init.ChecksumMode = ETH_CHECKSUM_BY_HARDWARE;
handle.Init.InterruptEnableBits = EIE_LINKIE; handle.Init.InterruptEnableBits = EIE_LINKIE | EIE_PKTIE;
debugstr("Setting MAC address to C0:FF:EE:C0:FF:EE.");
debugcrlf();
ENC_SetMacAddr(&handle);
debugstr("Starting network up."); debugstr("Starting network up.");
debugcrlf(); debugcrlf();

3
part14-ethernet/lib/spi.c
View file

@ -46,6 +46,9 @@ void spi_init() {
gpio_useAsAlt0(9); //MISO gpio_useAsAlt0(9); //MISO
gpio_useAsAlt0(10); //MOSI gpio_useAsAlt0(10); //MOSI
gpio_useAsAlt0(11); //SCLK gpio_useAsAlt0(11); //SCLK
REGS_SPI0->cs = 0x30;
REGS_SPI0->clock = 0x28; // 500Mhz / 40 = 12.5Mhz for ENC SPI
} }
void spi_chip_select(unsigned char chip_select) { void spi_chip_select(unsigned char chip_select) {

6
part14-ethernet/net/enc28j60.c
View file

@ -847,6 +847,10 @@ bool ENC_Start(ENC_HandleTypeDef *handle)
enc_wrbreg(handle, ENC_MAMXFLL, (CONFIG_NET_ETH_MTU+18) & 0xff); enc_wrbreg(handle, ENC_MAMXFLL, (CONFIG_NET_ETH_MTU+18) & 0xff);
enc_wrbreg(handle, ENC_MAMXFLH, (CONFIG_NET_ETH_MTU+18) >> 8); enc_wrbreg(handle, ENC_MAMXFLH, (CONFIG_NET_ETH_MTU+18) >> 8);
/* Set the Mac Address */
ENC_SetMacAddr(handle);
/* Configure LEDs (No, just use the defaults for now) */ /* Configure LEDs (No, just use the defaults for now) */
/* enc_wrphy(priv, ENC_PHLCON, ??); */ /* enc_wrphy(priv, ENC_PHLCON, ??); */
@ -927,6 +931,8 @@ void ENC_SetMacAddr(ENC_HandleTypeDef *handle)
enc_wrbreg(handle, ENC_MAADR4, handle->Init.MACAddr[3]); enc_wrbreg(handle, ENC_MAADR4, handle->Init.MACAddr[3]);
enc_wrbreg(handle, ENC_MAADR5, handle->Init.MACAddr[4]); enc_wrbreg(handle, ENC_MAADR5, handle->Init.MACAddr[4]);
enc_wrbreg(handle, ENC_MAADR6, handle->Init.MACAddr[5]); enc_wrbreg(handle, ENC_MAADR6, handle->Init.MACAddr[5]);
enc_wrbreg(handle, ENC_ECOCON, 0x2 & 0x7); // 12.5Mhz
} }