adds ThreadX clang-format settings and applies it to maceth driver

This commit is contained in:
2026-02-03 22:55:54 +01:00
parent 3e8fa257d5
commit 28c14404d2
3 changed files with 474 additions and 428 deletions

10
.clang-format Normal file
View File

@@ -0,0 +1,10 @@
BasedOnStyle: Microsoft
BinPackArguments: false
BinPackParameters: false
AlignAfterOpenBracket: DontAlign
AlignConsecutiveMacros: true
AlignConsecutiveAssignments: true
IndentCaseLabels: true
PointerAlignment: Left
BraceWrapping:
AfterCaseLabel: true

View File

@@ -6,7 +6,7 @@
"comment": "clang-format" "comment": "clang-format"
} }
], ],
"editor.formatOnSave": false, "editor.formatOnSave": true,
"clangd.arguments": [ "clangd.arguments": [
"--pretty", "--pretty",
"--background-index", "--background-index",

View File

@@ -41,7 +41,6 @@ extern int register_irq_handler(unsigned irq_num, void (*handler)());
#define NX_LINK_MTU 1514 #define NX_LINK_MTU 1514
#define NX_MAX_PACKET_SIZE 1536 #define NX_MAX_PACKET_SIZE 1536
/* Define Ethernet address format. This is prepended to the incoming IP /* Define Ethernet address format. This is prepended to the incoming IP
and ARP/RARP messages. The frame beginning is 14 bytes, but for speed and ARP/RARP messages. The frame beginning is 14 bytes, but for speed
purposes, we are going to assume there are 16 bytes free in front of the purposes, we are going to assume there are 16 bytes free in front of the
@@ -71,7 +70,6 @@ extern int register_irq_handler(unsigned irq_num, void (*handler)());
const ULONG mnrs_mac_address_msw = 0x0200; const ULONG mnrs_mac_address_msw = 0x0200;
const ULONG mnrs_mac_address_lsw = 0x00334450; const ULONG mnrs_mac_address_lsw = 0x00334450;
/* Define driver prototypes. */ /* Define driver prototypes. */
VOID _nx_mnrs_network_driver(NX_IP_DRIVER *driver_req_ptr); VOID _nx_mnrs_network_driver(NX_IP_DRIVER *driver_req_ptr);
@@ -171,14 +169,14 @@ static _nx_mnrs_network_driver_instance_type nx_mnrs_driver[NX_MAX_PHYSICAL_INTE
/* resulting in version 6.4.0 */ /* resulting in version 6.4.0 */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
VOID _nx_mnrs_network_driver(NX_IP_DRIVER *driver_req_ptr) VOID _nx_mnrs_network_driver(NX_IP_DRIVER* driver_req_ptr)
{ {
UINT i = 0; UINT i = 0;
NX_IP *ip_ptr; NX_IP* ip_ptr;
NX_PACKET *packet_ptr; NX_PACKET* packet_ptr;
NX_INTERFACE *interface_ptr; NX_INTERFACE* interface_ptr;
UINT interface_index; UINT interface_index;
USHORT ether_type; USHORT ether_type;
#ifndef NX_ENABLE_VLAN #ifndef NX_ENABLE_VLAN
ULONG *ethernet_frame_ptr; ULONG *ethernet_frame_ptr;
#endif /* NX_ENABLE_VLAN */ #endif /* NX_ENABLE_VLAN */
@@ -200,9 +198,12 @@ ULONG *ethernet_frame_ptr;
/* Obtain the index number of the network interface. */ /* Obtain the index number of the network interface. */
interface_index = interface_ptr -> nx_interface_index; interface_index = interface_ptr -> nx_interface_index;
/* Find out the driver interface if the driver command is not ATTACH. */ /* Find out the driver interface if the driver command is not ATTACH. */
if(driver_req_ptr->nx_ip_driver_command != NX_LINK_INTERFACE_ATTACH) { if (driver_req_ptr->nx_ip_driver_command != NX_LINK_INTERFACE_ATTACH)
for(i = 0; i < NX_MAX_PHYSICAL_INTERFACES; i++) { {
if(nx_mnrs_driver[i].nx_mnrs_network_driver_in_use == 0) { for (i = 0; i < NX_MAX_PHYSICAL_INTERFACES; i++)
{
if (nx_mnrs_driver[i].nx_mnrs_network_driver_in_use == 0)
{
continue; continue;
} }
if (nx_mnrs_driver[i].nx_mnrs_driver_ip_ptr != ip_ptr) if (nx_mnrs_driver[i].nx_mnrs_driver_ip_ptr != ip_ptr)
@@ -214,25 +215,29 @@ ULONG *ethernet_frame_ptr;
break; break;
} }
} }
if(i == NX_MAX_PHYSICAL_INTERFACES) { if (i == NX_MAX_PHYSICAL_INTERFACES)
{
driver_req_ptr->nx_ip_driver_status = NX_INVALID_INTERFACE; driver_req_ptr->nx_ip_driver_status = NX_INVALID_INTERFACE;
return; return;
} }
} }
/* Process according to the driver request type in the IP control /* Process according to the driver request type in the IP control
block. */ block. */
switch (driver_req_ptr -> nx_ip_driver_command) switch (driver_req_ptr->nx_ip_driver_command)
{ {
case NX_LINK_INTERFACE_ATTACH: case NX_LINK_INTERFACE_ATTACH:
{ {
/* Find an available driver instance to attach the interface. */ /* Find an available driver instance to attach the interface. */
for(i = 0; i < NX_MAX_PHYSICAL_INTERFACES; i++) { for (i = 0; i < NX_MAX_PHYSICAL_INTERFACES; i++)
if(nx_mnrs_driver[i].nx_mnrs_network_driver_in_use == 0) { {
if (nx_mnrs_driver[i].nx_mnrs_network_driver_in_use == 0)
{
break; break;
} }
} }
/* An available entry is found. */ /* An available entry is found. */
if(i < NX_MAX_PHYSICAL_INTERFACES) { if (i < NX_MAX_PHYSICAL_INTERFACES)
{
/* Set the IN USE flag.*/ /* Set the IN USE flag.*/
nx_mnrs_driver[i].nx_mnrs_network_driver_in_use = 1; nx_mnrs_driver[i].nx_mnrs_network_driver_in_use = 1;
nx_mnrs_driver[i].nx_mnrs_network_driver_id = i; nx_mnrs_driver[i].nx_mnrs_network_driver_id = i;
@@ -244,7 +249,8 @@ ULONG *ethernet_frame_ptr;
nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_msw = mnrs_mac_address_msw; nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_msw = mnrs_mac_address_msw;
nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_lsw = mnrs_mac_address_lsw + i; nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_lsw = mnrs_mac_address_lsw + i;
/* Record the peripheral address */ /* Record the peripheral address */
switch(i) { switch (i)
{
case 0: case 0:
nx_mnrs_driver[i].ethmac = ethmac0; nx_mnrs_driver[i].ethmac = ethmac0;
break; break;
@@ -266,7 +272,7 @@ ULONG *ethernet_frame_ptr;
} }
else else
{ {
driver_req_ptr -> nx_ip_driver_status = NX_INVALID_INTERFACE; driver_req_ptr->nx_ip_driver_status = NX_INVALID_INTERFACE;
} }
break; break;
} }
@@ -280,15 +286,16 @@ ULONG *ethernet_frame_ptr;
{ {
/* Device driver shall initialize the Ethernet Controller here. */ /* Device driver shall initialize the Ethernet Controller here. */
#ifdef NX_DEBUG #ifdef NX_DEBUG
printf("NetX MNRS ETH Driver Initialization - %s\n", ip_ptr -> nx_ip_name); printf("NetX MNRS ETH Driver Initialization - %s\n", ip_ptr->nx_ip_name);
printf(" IP Address =%08X\n", ip_ptr -> nx_ip_address); printf(" IP Address =%08X\n", ip_ptr->nx_ip_address);
#endif #endif
// enable TX & RX path // enable TX & RX path
set_ethmac_mac_ctrl(nx_mnrs_driver[i].ethmac, set_ethmac_mac_ctrl(nx_mnrs_driver[i].ethmac,
get_ethmac_mac_ctrl(nx_mnrs_driver[i].ethmac) & ~(ETHMAC_MAC_CTRL_TX_FLUSH(1)| ETHMAC_MAC_CTRL_RX_FLUSH(1))); get_ethmac_mac_ctrl(nx_mnrs_driver[i].ethmac) &
~(ETHMAC_MAC_CTRL_TX_FLUSH(1) | ETHMAC_MAC_CTRL_RX_FLUSH(1)));
register_irq_handler(ETH0_IRQ, &_nx_mnrs_eth_recv_packet_eth0); register_irq_handler(ETH0_IRQ, &_nx_mnrs_eth_recv_packet_eth0);
register_irq_handler(ETH1_IRQ, &_nx_mnrs_eth_recv_packet_eth1); register_irq_handler(ETH1_IRQ, &_nx_mnrs_eth_recv_packet_eth1);
csr_read_set_bits_mie(1<<ETH0_IRQ | 1<<ETH1_IRQ); csr_read_set_bits_mie(1 << ETH0_IRQ | 1 << ETH1_IRQ);
set_ethmac_mac_intr_rx_data_avail_intr_enable(nx_mnrs_driver[i].ethmac, 1); set_ethmac_mac_intr_rx_data_avail_intr_enable(nx_mnrs_driver[i].ethmac, 1);
/* Once the Ethernet controller is initialized, the driver needs to /* Once the Ethernet controller is initialized, the driver needs to
configure the NetX Interface Control block, as outlined below. */ configure the NetX Interface Control block, as outlined below. */
@@ -300,9 +307,11 @@ ULONG *ethernet_frame_ptr;
/* For this MNRS ETH driver, the MAC address is constructed by /* For this MNRS ETH driver, the MAC address is constructed by
incrementing a base lsw value, to simulate multiple nodes on the incrementing a base lsw value, to simulate multiple nodes on the
ethernet. */ ethernet. */
nx_ip_interface_physical_address_set(ip_ptr, interface_index, nx_ip_interface_physical_address_set(ip_ptr,
interface_index,
nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_msw, nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_msw,
nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_lsw, NX_FALSE); nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_lsw,
NX_FALSE);
/* Indicate to the IP software that IP to physical mapping is required. */ /* Indicate to the IP software that IP to physical mapping is required. */
nx_ip_interface_address_mapping_configure(ip_ptr, interface_index, NX_TRUE); nx_ip_interface_address_mapping_configure(ip_ptr, interface_index, NX_TRUE);
break; break;
@@ -311,13 +320,14 @@ ULONG *ethernet_frame_ptr;
{ {
// disable TX & RX path // disable TX & RX path
set_ethmac_mac_intr_rx_data_avail_intr_enable(nx_mnrs_driver[i].ethmac, 0); set_ethmac_mac_intr_rx_data_avail_intr_enable(nx_mnrs_driver[i].ethmac, 0);
csr_read_clr_bits_mie(1<<ETH0_IRQ | 1<<ETH1_IRQ); csr_read_clr_bits_mie(1 << ETH0_IRQ | 1 << ETH1_IRQ);
register_irq_handler(ETH0_IRQ, NULL); register_irq_handler(ETH0_IRQ, NULL);
register_irq_handler(ETH1_IRQ, NULL); register_irq_handler(ETH1_IRQ, NULL);
// set_ethmac_mac_ctrl_tx_flush(nx_mnrs_driver[i].ethmac, 1); // set_ethmac_mac_ctrl_tx_flush(nx_mnrs_driver[i].ethmac, 1);
// set_ethmac_mac_ctrl_rx_flush(nx_mnrs_driver[i].ethmac, 1); // set_ethmac_mac_ctrl_rx_flush(nx_mnrs_driver[i].ethmac, 1);
set_ethmac_mac_ctrl(nx_mnrs_driver[i].ethmac, set_ethmac_mac_ctrl(nx_mnrs_driver[i].ethmac,
get_ethmac_mac_ctrl(nx_mnrs_driver[i].ethmac) | ETHMAC_MAC_CTRL_TX_FLUSH(1)| ETHMAC_MAC_CTRL_RX_FLUSH(1)); get_ethmac_mac_ctrl(nx_mnrs_driver[i].ethmac) | ETHMAC_MAC_CTRL_TX_FLUSH(1) |
ETHMAC_MAC_CTRL_RX_FLUSH(1));
/* Zero out the driver instance. */ /* Zero out the driver instance. */
memset(&(nx_mnrs_driver[i]), 0, sizeof(_nx_mnrs_network_driver_instance_type)); memset(&(nx_mnrs_driver[i]), 0, sizeof(_nx_mnrs_network_driver_instance_type));
break; break;
@@ -330,9 +340,9 @@ ULONG *ethernet_frame_ptr;
// set_ethmac_int_ctrl_reg_tx_free_intr_enable(nx_mnrs_driver[i].ethmac, 1); // set_ethmac_int_ctrl_reg_tx_free_intr_enable(nx_mnrs_driver[i].ethmac, 1);
set_ethmac_mac_intr_rx_data_avail_intr_enable(nx_mnrs_driver[i].ethmac, 1); set_ethmac_mac_intr_rx_data_avail_intr_enable(nx_mnrs_driver[i].ethmac, 1);
/* In the MNRS ETH driver, just set the enabled flag. */ /* In the MNRS ETH driver, just set the enabled flag. */
interface_ptr -> nx_interface_link_up = NX_TRUE; interface_ptr->nx_interface_link_up = NX_TRUE;
#ifdef NX_DEBUG #ifdef NX_DEBUG
printf("NetX MNRS ETH Driver Link Enabled - %s\n", ip_ptr -> nx_ip_name); printf("NetX MNRS ETH Driver Link Enabled - %s\n", ip_ptr->nx_ip_name);
#endif #endif
break; break;
} }
@@ -346,9 +356,9 @@ ULONG *ethernet_frame_ptr;
// set_ethmac_int_ctrl_reg_tx_free_intr_enable(nx_mnrs_driver[i].ethmac, 0); // set_ethmac_int_ctrl_reg_tx_free_intr_enable(nx_mnrs_driver[i].ethmac, 0);
set_ethmac_mac_intr_rx_data_avail_intr_enable(nx_mnrs_driver[i].ethmac, 0); set_ethmac_mac_intr_rx_data_avail_intr_enable(nx_mnrs_driver[i].ethmac, 0);
/* In the MNRS ETH driver, just clear the enabled flag. */ /* In the MNRS ETH driver, just clear the enabled flag. */
interface_ptr -> nx_interface_link_up = NX_FALSE; interface_ptr->nx_interface_link_up = NX_FALSE;
#ifdef NX_DEBUG #ifdef NX_DEBUG
printf("NetX MNRS ETH Driver Link Disabled - %s\n", ip_ptr -> nx_ip_name); printf("NetX MNRS ETH Driver Link Disabled - %s\n", ip_ptr->nx_ip_name);
#endif #endif
break; break;
} }
@@ -367,21 +377,21 @@ ULONG *ethernet_frame_ptr;
The following sequence illustrates this process. The following sequence illustrates this process.
*/ */
/* Place the ethernet frame at the front of the packet. */ /* Place the ethernet frame at the front of the packet. */
packet_ptr = driver_req_ptr -> nx_ip_driver_packet; packet_ptr = driver_req_ptr->nx_ip_driver_packet;
/* Get Ethernet type. */ /* Get Ethernet type. */
if (driver_req_ptr -> nx_ip_driver_command == NX_LINK_ARP_SEND) if (driver_req_ptr->nx_ip_driver_command == NX_LINK_ARP_SEND)
{ {
ether_type = NX_ETHERNET_ARP; ether_type = NX_ETHERNET_ARP;
} }
else if (driver_req_ptr -> nx_ip_driver_command == NX_LINK_ARP_RESPONSE_SEND) else if (driver_req_ptr->nx_ip_driver_command == NX_LINK_ARP_RESPONSE_SEND)
{ {
ether_type = NX_ETHERNET_ARP; ether_type = NX_ETHERNET_ARP;
} }
else if (driver_req_ptr -> nx_ip_driver_command == NX_LINK_RARP_SEND) else if (driver_req_ptr->nx_ip_driver_command == NX_LINK_RARP_SEND)
{ {
ether_type = NX_ETHERNET_RARP; ether_type = NX_ETHERNET_RARP;
} }
else if (packet_ptr -> nx_packet_ip_version == 4) else if (packet_ptr->nx_packet_ip_version == 4)
{ {
ether_type = NX_ETHERNET_IP; ether_type = NX_ETHERNET_IP;
} }
@@ -392,9 +402,10 @@ ULONG *ethernet_frame_ptr;
#ifdef NX_ENABLE_VLAN #ifdef NX_ENABLE_VLAN
/* Add Ethernet header. */ /* Add Ethernet header. */
if (nx_link_ethernet_header_add(ip_ptr, if (nx_link_ethernet_header_add(ip_ptr,
driver_req_ptr -> nx_ip_driver_interface -> nx_interface_index, packet_ptr, driver_req_ptr->nx_ip_driver_interface->nx_interface_index,
driver_req_ptr -> nx_ip_driver_physical_address_msw, packet_ptr,
driver_req_ptr -> nx_ip_driver_physical_address_lsw, driver_req_ptr->nx_ip_driver_physical_address_msw,
driver_req_ptr->nx_ip_driver_physical_address_lsw,
(UINT)ether_type)) (UINT)ether_type))
{ {
/* Release the packet. */ /* Release the packet. */
@@ -403,19 +414,19 @@ ULONG *ethernet_frame_ptr;
} }
#else #else
/* Adjust the prepend pointer. */ /* Adjust the prepend pointer. */
packet_ptr -> nx_packet_prepend_ptr = packet_ptr -> nx_packet_prepend_ptr - NX_ETHERNET_SIZE; packet_ptr->nx_packet_prepend_ptr = packet_ptr->nx_packet_prepend_ptr - NX_ETHERNET_SIZE;
/* Adjust the packet length. */ /* Adjust the packet length. */
packet_ptr -> nx_packet_length = packet_ptr -> nx_packet_length + NX_ETHERNET_SIZE; packet_ptr->nx_packet_length = packet_ptr->nx_packet_length + NX_ETHERNET_SIZE;
/* Setup the ethernet frame pointer to build the ethernet frame. Backup another 2 /* Setup the ethernet frame pointer to build the ethernet frame. Backup another 2
bytes to get 32-bit word alignment. */ bytes to get 32-bit word alignment. */
/*lint -e{927} -e{826} suppress cast of pointer to pointer, since it is necessary */ /*lint -e{927} -e{826} suppress cast of pointer to pointer, since it is necessary */
ethernet_frame_ptr = (ULONG *)(packet_ptr -> nx_packet_prepend_ptr - 2); ethernet_frame_ptr = (ULONG*)(packet_ptr->nx_packet_prepend_ptr - 2);
/* Build the ethernet frame. */ /* Build the ethernet frame. */
*ethernet_frame_ptr = driver_req_ptr -> nx_ip_driver_physical_address_msw; *ethernet_frame_ptr = driver_req_ptr->nx_ip_driver_physical_address_msw;
*(ethernet_frame_ptr + 1) = driver_req_ptr -> nx_ip_driver_physical_address_lsw; *(ethernet_frame_ptr + 1) = driver_req_ptr->nx_ip_driver_physical_address_lsw;
*(ethernet_frame_ptr + 2) = (interface_ptr -> nx_interface_physical_address_msw << 16) | *(ethernet_frame_ptr + 2) = (interface_ptr->nx_interface_physical_address_msw << 16) |
(interface_ptr -> nx_interface_physical_address_lsw >> 16); (interface_ptr->nx_interface_physical_address_lsw >> 16);
*(ethernet_frame_ptr + 3) = (interface_ptr -> nx_interface_physical_address_lsw << 16) | ether_type; *(ethernet_frame_ptr + 3) = (interface_ptr->nx_interface_physical_address_lsw << 16) | ether_type;
/* Endian swapping if NX_LITTLE_ENDIAN is defined. */ /* Endian swapping if NX_LITTLE_ENDIAN is defined. */
NX_CHANGE_ULONG_ENDIAN(*(ethernet_frame_ptr)); NX_CHANGE_ULONG_ENDIAN(*(ethernet_frame_ptr));
NX_CHANGE_ULONG_ENDIAN(*(ethernet_frame_ptr + 1)); NX_CHANGE_ULONG_ENDIAN(*(ethernet_frame_ptr + 1));
@@ -423,7 +434,7 @@ ULONG *ethernet_frame_ptr;
NX_CHANGE_ULONG_ENDIAN(*(ethernet_frame_ptr + 3)); NX_CHANGE_ULONG_ENDIAN(*(ethernet_frame_ptr + 3));
#endif /* NX_ENABLE_VLAN */ #endif /* NX_ENABLE_VLAN */
#ifdef NX_DEBUG_PACKET #ifdef NX_DEBUG_PACKET
printf("NetX MNRS ETH Driver Packet Send - %s\n", ip_ptr -> nx_ip_name); printf("NetX MNRS ETH Driver Packet Send - %s\n", ip_ptr->nx_ip_name);
#endif #endif
/* At this point, the packet is a complete Ethernet frame, ready to be transmitted. /* At this point, the packet is a complete Ethernet frame, ready to be transmitted.
The driver shall call the actual Ethernet transmit routine and put the packet The driver shall call the actual Ethernet transmit routine and put the packet
@@ -437,7 +448,7 @@ ULONG *ethernet_frame_ptr;
case NX_LINK_RAW_PACKET_SEND: case NX_LINK_RAW_PACKET_SEND:
{ {
/* Send raw packet out directly. */ /* Send raw packet out directly. */
_nx_mnrs_network_driver_output(driver_req_ptr -> nx_ip_driver_packet, i); _nx_mnrs_network_driver_output(driver_req_ptr->nx_ip_driver_packet, i);
break; break;
} }
#endif /* NX_ENABLE_VLAN */ #endif /* NX_ENABLE_VLAN */
@@ -461,14 +472,16 @@ ULONG *ethernet_frame_ptr;
if (nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_msw == 0 && if (nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_msw == 0 &&
nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_lsw == 0) nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_lsw == 0)
{ {
nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_msw = driver_req_ptr -> nx_ip_driver_physical_address_msw; nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_msw =
nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_lsw = driver_req_ptr -> nx_ip_driver_physical_address_lsw; driver_req_ptr->nx_ip_driver_physical_address_msw;
nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_lsw =
driver_req_ptr->nx_ip_driver_physical_address_lsw;
break; break;
} }
} }
if (mcast_index == NX_MNRS_DRIVER_MAX_MCAST_ADDRESSES) if (mcast_index == NX_MNRS_DRIVER_MAX_MCAST_ADDRESSES)
{ {
driver_req_ptr -> nx_ip_driver_status = NX_NO_MORE_ENTRIES; driver_req_ptr->nx_ip_driver_status = NX_NO_MORE_ENTRIES;
} }
break; break;
} }
@@ -485,8 +498,10 @@ ULONG *ethernet_frame_ptr;
multicast MAC addresses by a simple look up table. */ multicast MAC addresses by a simple look up table. */
for (mcast_index = 0; mcast_index < NX_MNRS_DRIVER_MAX_MCAST_ADDRESSES; mcast_index++) for (mcast_index = 0; mcast_index < NX_MNRS_DRIVER_MAX_MCAST_ADDRESSES; mcast_index++)
{ {
if (nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_msw == driver_req_ptr -> nx_ip_driver_physical_address_msw && if (nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_msw ==
nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_lsw == driver_req_ptr -> nx_ip_driver_physical_address_lsw) driver_req_ptr->nx_ip_driver_physical_address_msw &&
nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_lsw ==
driver_req_ptr->nx_ip_driver_physical_address_lsw)
{ {
nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_msw = 0; nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_msw = 0;
nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_lsw = 0; nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_lsw = 0;
@@ -495,56 +510,56 @@ ULONG *ethernet_frame_ptr;
} }
if (mcast_index == NX_MNRS_DRIVER_MAX_MCAST_ADDRESSES) if (mcast_index == NX_MNRS_DRIVER_MAX_MCAST_ADDRESSES)
{ {
driver_req_ptr -> nx_ip_driver_status = NX_ENTRY_NOT_FOUND; driver_req_ptr->nx_ip_driver_status = NX_ENTRY_NOT_FOUND;
} }
break; break;
} }
case NX_LINK_GET_STATUS: case NX_LINK_GET_STATUS:
{ {
/* Return the link status in the supplied return pointer. */ /* Return the link status in the supplied return pointer. */
*(driver_req_ptr -> nx_ip_driver_return_ptr) = ip_ptr -> nx_ip_interface[0].nx_interface_link_up; *(driver_req_ptr->nx_ip_driver_return_ptr) = ip_ptr->nx_ip_interface[0].nx_interface_link_up;
break; break;
} }
case NX_LINK_GET_SPEED: case NX_LINK_GET_SPEED:
{ {
/* Return the link's line speed in the supplied return pointer. Unsupported feature. */ /* Return the link's line speed in the supplied return pointer. Unsupported feature. */
*(driver_req_ptr -> nx_ip_driver_return_ptr) = 0; *(driver_req_ptr->nx_ip_driver_return_ptr) = 0;
break; break;
} }
case NX_LINK_GET_DUPLEX_TYPE: case NX_LINK_GET_DUPLEX_TYPE:
{ {
/* Return the link's line speed in the supplied return pointer. Unsupported feature. */ /* Return the link's line speed in the supplied return pointer. Unsupported feature. */
*(driver_req_ptr -> nx_ip_driver_return_ptr) = 0; *(driver_req_ptr->nx_ip_driver_return_ptr) = 0;
break; break;
} }
case NX_LINK_GET_ERROR_COUNT: case NX_LINK_GET_ERROR_COUNT:
{ {
/* Return the link's line speed in the supplied return pointer. Unsupported feature. */ /* Return the link's line speed in the supplied return pointer. Unsupported feature. */
*(driver_req_ptr -> nx_ip_driver_return_ptr) = 0; *(driver_req_ptr->nx_ip_driver_return_ptr) = 0;
break; break;
} }
case NX_LINK_GET_RX_COUNT: case NX_LINK_GET_RX_COUNT:
{ {
/* Return the link's line speed in the supplied return pointer. Unsupported feature. */ /* Return the link's line speed in the supplied return pointer. Unsupported feature. */
*(driver_req_ptr -> nx_ip_driver_return_ptr) = 0; *(driver_req_ptr->nx_ip_driver_return_ptr) = 0;
break; break;
} }
case NX_LINK_GET_TX_COUNT: case NX_LINK_GET_TX_COUNT:
{ {
/* Return the link's line speed in the supplied return pointer. Unsupported feature. */ /* Return the link's line speed in the supplied return pointer. Unsupported feature. */
*(driver_req_ptr -> nx_ip_driver_return_ptr) = 0; *(driver_req_ptr->nx_ip_driver_return_ptr) = 0;
break; break;
} }
case NX_LINK_GET_ALLOC_ERRORS: case NX_LINK_GET_ALLOC_ERRORS:
{ {
/* Return the link's line speed in the supplied return pointer. Unsupported feature. */ /* Return the link's line speed in the supplied return pointer. Unsupported feature. */
*(driver_req_ptr -> nx_ip_driver_return_ptr) = 0; *(driver_req_ptr->nx_ip_driver_return_ptr) = 0;
break; break;
} }
case NX_LINK_GET_INTERFACE_TYPE: case NX_LINK_GET_INTERFACE_TYPE:
{ {
/* Return the link's interface type in the supplied return pointer. Unsupported feature. */ /* Return the link's interface type in the supplied return pointer. Unsupported feature. */
*(driver_req_ptr -> nx_ip_driver_return_ptr) = NX_INTERFACE_TYPE_UNKNOWN; *(driver_req_ptr->nx_ip_driver_return_ptr) = NX_INTERFACE_TYPE_UNKNOWN;
break; break;
} }
case NX_LINK_DEFERRED_PROCESSING: case NX_LINK_DEFERRED_PROCESSING:
@@ -569,28 +584,34 @@ ULONG *ethernet_frame_ptr;
case NX_LINK_SET_PHYSICAL_ADDRESS: case NX_LINK_SET_PHYSICAL_ADDRESS:
{ {
/* Find an driver instance to attach the interface. */ /* Find an driver instance to attach the interface. */
for(i = 0; i < NX_MAX_PHYSICAL_INTERFACES; i++) { for (i = 0; i < NX_MAX_PHYSICAL_INTERFACES; i++)
if(nx_mnrs_driver[i].nx_mnrs_driver_interface_ptr == interface_ptr) { {
if (nx_mnrs_driver[i].nx_mnrs_driver_interface_ptr == interface_ptr)
{
break; break;
} }
} }
/* An available entry is found. */ /* An available entry is found. */
if(i < NX_MAX_PHYSICAL_INTERFACES) { if (i < NX_MAX_PHYSICAL_INTERFACES)
{
/* Set the physical address. */ /* Set the physical address. */
nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_msw = driver_req_ptr -> nx_ip_driver_physical_address_msw; nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_msw =
nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_lsw = driver_req_ptr -> nx_ip_driver_physical_address_lsw; driver_req_ptr->nx_ip_driver_physical_address_msw;
nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_lsw =
driver_req_ptr->nx_ip_driver_physical_address_lsw;
} }
else else
{ {
driver_req_ptr -> nx_ip_driver_status = NX_INVALID_INTERFACE; driver_req_ptr->nx_ip_driver_status = NX_INVALID_INTERFACE;
} }
break; break;
} }
#ifdef NX_ENABLE_INTERFACE_CAPABILITY #ifdef NX_ENABLE_INTERFACE_CAPABILITY
case NX_INTERFACE_CAPABILITY_GET: case NX_INTERFACE_CAPABILITY_GET:
{ {
/* Return the capability of the Ethernet controller speed in the supplied return pointer. Unsupported feature. */ /* Return the capability of the Ethernet controller speed in the supplied return pointer. Unsupported
*(driver_req_ptr -> nx_ip_driver_return_ptr) = 0; * feature. */
*(driver_req_ptr->nx_ip_driver_return_ptr) = 0;
break; break;
} }
case NX_INTERFACE_CAPABILITY_SET: case NX_INTERFACE_CAPABILITY_SET:
@@ -603,9 +624,9 @@ ULONG *ethernet_frame_ptr;
/* Invalid driver request. */ /* Invalid driver request. */
/* Return the unhandled command status. */ /* Return the unhandled command status. */
driver_req_ptr -> nx_ip_driver_status = NX_UNHANDLED_COMMAND; driver_req_ptr->nx_ip_driver_status = NX_UNHANDLED_COMMAND;
#ifdef NX_DEBUG #ifdef NX_DEBUG
printf("NetX MNRS ETH Driver Received invalid request - %s\n", ip_ptr -> nx_ip_name); printf("NetX MNRS ETH Driver Received invalid request - %s\n", ip_ptr->nx_ip_name);
#endif #endif
break; break;
} }
@@ -660,9 +681,9 @@ ULONG *ethernet_frame_ptr;
/* resulting in version 6.4.0 */ /* resulting in version 6.4.0 */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
void _nx_mnrs_network_driver_output(NX_PACKET *packet_ptr, UINT interface_instance_id) void _nx_mnrs_network_driver_output(NX_PACKET* packet_ptr, UINT interface_instance_id)
{ {
UINT old_threshold = 0; UINT old_threshold = 0;
#ifdef NX_DEBUG_PACKET #ifdef NX_DEBUG_PACKET
UCHAR *ptr; UCHAR *ptr;
@@ -683,7 +704,7 @@ UINT i, j;
printf("%02X ", *ptr++); printf("%02X ", *ptr++);
i = 0; i = 0;
for (j = 0; j < (packet_ptr -> nx_packet_length - NX_ETHERNET_SIZE); j++) for (j = 0; j < (packet_ptr->nx_packet_length - NX_ETHERNET_SIZE); j++)
{ {
printf("%02X", *ptr++); printf("%02X", *ptr++);
i++; i++;
@@ -702,8 +723,9 @@ UINT i, j;
#ifdef NX_ENABLE_VLAN #ifdef NX_ENABLE_VLAN
/* Release the packet. */ /* Release the packet. */
nx_link_packet_transmitted(nx_mnrs_driver[interface_instance_id].nx_mnrs_driver_ip_ptr, nx_link_packet_transmitted(nx_mnrs_driver[interface_instance_id].nx_mnrs_driver_ip_ptr,
nx_mnrs_driver[interface_instance_id].nx_mnrs_driver_interface_ptr -> nx_interface_index, nx_mnrs_driver[interface_instance_id].nx_mnrs_driver_interface_ptr->nx_interface_index,
packet_ptr, NX_NULL); packet_ptr,
NX_NULL);
#else #else
/* Remove the Ethernet header. In real hardware environments, this is typically /* Remove the Ethernet header. In real hardware environments, this is typically
done after a transmit complete interrupt. */ done after a transmit complete interrupt. */
@@ -770,21 +792,23 @@ UINT i, j;
/* resulting in version 6.4.0 */ /* resulting in version 6.4.0 */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
void _nx_mnrs_network_driver_receive(NX_IP *ip_ptr, NX_PACKET *packet_ptr, UINT interface_instance_id) void _nx_mnrs_network_driver_receive(NX_IP* ip_ptr, NX_PACKET* packet_ptr, UINT interface_instance_id)
{ {
UINT packet_type; UINT packet_type;
#ifdef NX_ENABLE_VLAN #ifdef NX_ENABLE_VLAN
nx_link_ethernet_packet_received(ip_ptr, nx_link_ethernet_packet_received(ip_ptr,
nx_mnrs_driver[interface_instance_id].nx_mnrs_driver_interface_ptr -> nx_interface_index, nx_mnrs_driver[interface_instance_id].nx_mnrs_driver_interface_ptr->nx_interface_index,
packet_ptr, NX_NULL); packet_ptr,
NX_NULL);
#else #else
/* Pickup the packet header to determine where the packet needs to be /* Pickup the packet header to determine where the packet needs to be
sent. */ sent. */
packet_type = (((UINT)(*(packet_ptr -> nx_packet_prepend_ptr + 12))) << 8) | packet_type = (((UINT)(*(packet_ptr->nx_packet_prepend_ptr + 12))) << 8) |
((UINT)(*(packet_ptr -> nx_packet_prepend_ptr + 13))); ((UINT)(*(packet_ptr->nx_packet_prepend_ptr + 13)));
/* Setup interface pointer. */ /* Setup interface pointer. */
packet_ptr -> nx_packet_address.nx_packet_interface_ptr = nx_mnrs_driver[interface_instance_id].nx_mnrs_driver_interface_ptr; packet_ptr->nx_packet_address.nx_packet_interface_ptr =
nx_mnrs_driver[interface_instance_id].nx_mnrs_driver_interface_ptr;
/* Route the incoming packet according to its ethernet type. */ /* Route the incoming packet according to its ethernet type. */
/* The MNRS ETH driver accepts both IPv4 and IPv6 frames. */ /* The MNRS ETH driver accepts both IPv4 and IPv6 frames. */
if ((packet_type == NX_ETHERNET_IP) || (packet_type == NX_ETHERNET_IPV6)) if ((packet_type == NX_ETHERNET_IP) || (packet_type == NX_ETHERNET_IPV6))
@@ -842,32 +866,37 @@ UINT packet_type;
#endif /* NX_ENABLE_VLAN */ #endif /* NX_ENABLE_VLAN */
} }
UINT _nx_mnrs_eth_send_packet(NX_PACKET *packet_ptr, volatile ethmac_t* ethmac){ UINT _nx_mnrs_eth_send_packet(NX_PACKET* packet_ptr, volatile ethmac_t* ethmac)
ULONG size = 0; {
UCHAR *data; ULONG size = 0;
UINT i; UCHAR* data;
ULONG buffer; UINT i;
ULONG words; ULONG buffer;
ULONG words;
/* Make sure the data length is less than MTU. */ /* Make sure the data length is less than MTU. */
if (packet_ptr -> nx_packet_length > NX_MAX_PACKET_SIZE) if (packet_ptr->nx_packet_length > NX_MAX_PACKET_SIZE)
{ {
return NX_NOT_SUCCESSFUL; return NX_NOT_SUCCESSFUL;
} }
/* get data pointer to be transmitted. */ /* get data pointer to be transmitted. */
data = packet_ptr -> nx_packet_prepend_ptr; data = packet_ptr->nx_packet_prepend_ptr;
size = packet_ptr -> nx_packet_length; size = packet_ptr->nx_packet_length;
words = (size+3)/4; words = (size + 3) / 4;
while(get_ethmac_mac_ctrl_tx_ready(ethmac) == 0) while (get_ethmac_mac_ctrl_tx_ready(ethmac) == 0)
; ;
set_ethmac_mac_tx(ethmac, size*8); set_ethmac_mac_tx(ethmac, size * 8);
for(i=0; i<size; i+=4) { for (i = 0; i < size; i += 4)
if(i<size-3) { {
memcpy(&buffer, data+i, 4); if (i < size - 3)
} else { {
memcpy(&buffer, data+i, size-i); memcpy(&buffer, data + i, 4);
} }
while(!get_ethmac_mac_ctrl_tx_ready(ethmac)) else
{
memcpy(&buffer, data + i, size - i);
}
while (!get_ethmac_mac_ctrl_tx_ready(ethmac))
; ;
set_ethmac_mac_tx(ethmac, buffer); set_ethmac_mac_tx(ethmac, buffer);
@@ -875,22 +904,26 @@ ULONG words;
return NX_SUCCESS; return NX_SUCCESS;
} }
UINT mac_addr_hit(UINT i, MAC_ADDRESS* mac_addr) { UINT mac_addr_hit(UINT i, MAC_ADDRESS* mac_addr)
{
UINT mcast_index; UINT mcast_index;
if (nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_msw == mac_addr->nx_mac_address_msw && if (nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_msw == mac_addr->nx_mac_address_msw &&
nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_lsw == mac_addr -> nx_mac_address_lsw) nx_mnrs_driver[i].nx_mnrs_driver_mac_address.nx_mac_address_lsw == mac_addr->nx_mac_address_lsw)
{ {
return 1; return 1;
} }
return 0; return 0;
} }
UINT mcast_mac_addr_hit_idx(UINT i, MAC_ADDRESS*mac_addr) { UINT mcast_mac_addr_hit_idx(UINT i, MAC_ADDRESS* mac_addr)
{
UINT mcast_index; UINT mcast_index;
for (mcast_index = 0; mcast_index < NX_MNRS_DRIVER_MAX_MCAST_ADDRESSES; mcast_index++) for (mcast_index = 0; mcast_index < NX_MNRS_DRIVER_MAX_MCAST_ADDRESSES; mcast_index++)
{ {
if (nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_msw == mac_addr->nx_mac_address_msw && if (nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_msw ==
nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_lsw == mac_addr -> nx_mac_address_lsw) mac_addr->nx_mac_address_msw &&
nx_mnrs_driver[i].nx_mnrs_driver_mcast_address[mcast_index].nx_mac_address_lsw ==
mac_addr->nx_mac_address_lsw)
{ {
return i; return i;
} }
@@ -899,7 +932,8 @@ UINT mcast_mac_addr_hit_idx(UINT i, MAC_ADDRESS*mac_addr) {
} }
static UCHAR nx_mnrs_receive_buffer[NX_MAX_PACKET_SIZE]; static UCHAR nx_mnrs_receive_buffer[NX_MAX_PACKET_SIZE];
VOID _nx_mnrs_eth_recv_packet(UINT id, volatile ethmac_t* ethmac) { VOID _nx_mnrs_eth_recv_packet(UINT id, volatile ethmac_t* ethmac)
{
UINT bits_received; UINT bits_received;
UINT words_to_read; UINT words_to_read;
UINT i, j; UINT i, j;
@@ -914,12 +948,12 @@ VOID _nx_mnrs_eth_recv_packet(UINT id, volatile ethmac_t* ethmac) {
set_ethmac_mac_intr_rx_data_avail_intr_enable(ethmac, 0); set_ethmac_mac_intr_rx_data_avail_intr_enable(ethmac, 0);
bits_received = get_ethmac_mac_rx(ethmac); bits_received = get_ethmac_mac_rx(ethmac);
words_to_read = (bits_received+31)/32; words_to_read = (bits_received + 31) / 32;
if(words_to_read<4) if (words_to_read < 4)
{ {
for(j = 0;j < words_to_read;j++) for (j = 0; j < words_to_read; j++)
{ {
while(!get_ethmac_mac_ctrl_rx_pending(ethmac)) while (!get_ethmac_mac_ctrl_rx_pending(ethmac))
; ;
// be carefull of unaligned accesses since data is 2byte aligned // be carefull of unaligned accesses since data is 2byte aligned
word = get_ethmac_mac_rx(ethmac); word = get_ethmac_mac_rx(ethmac);
@@ -929,18 +963,18 @@ VOID _nx_mnrs_eth_recv_packet(UINT id, volatile ethmac_t* ethmac) {
return; return;
} }
// find the diver instance belonging to our ethmac // find the diver instance belonging to our ethmac
for(i=0; i<NX_MAX_PHYSICAL_INTERFACES; ++i) { for (i = 0; i < NX_MAX_PHYSICAL_INTERFACES; ++i)
if(nx_mnrs_driver[i].ethmac == ethmac) {
if (nx_mnrs_driver[i].ethmac == ethmac)
{ {
ip_ptr = nx_mnrs_driver[i].nx_mnrs_driver_ip_ptr; ip_ptr = nx_mnrs_driver[i].nx_mnrs_driver_ip_ptr;
status = nx_packet_allocate(ip_ptr->nx_ip_default_packet_pool, status = nx_packet_allocate(ip_ptr->nx_ip_default_packet_pool, &packet_ptr, NX_RECEIVE_PACKET, NX_NO_WAIT);
&packet_ptr, NX_RECEIVE_PACKET, NX_NO_WAIT);
if (status) if (status)
{ {
packet_ptr = NX_NULL; packet_ptr = NX_NULL;
data = nx_mnrs_receive_buffer; data = nx_mnrs_receive_buffer;
} }
else if(ip_ptr->nx_ip_default_packet_pool->nx_packet_pool_payload_size >= (NX_LINK_MTU + 2)) else if (ip_ptr->nx_ip_default_packet_pool->nx_packet_pool_payload_size >= (NX_LINK_MTU + 2))
{ {
data = packet_ptr->nx_packet_prepend_ptr + 2; data = packet_ptr->nx_packet_prepend_ptr + 2;
} }
@@ -949,15 +983,15 @@ VOID _nx_mnrs_eth_recv_packet(UINT id, volatile ethmac_t* ethmac) {
data = nx_mnrs_receive_buffer; data = nx_mnrs_receive_buffer;
} }
/* now get the remaining bytes from the ethmac peripheral */ /* now get the remaining bytes from the ethmac peripheral */
for(j = 0;j < words_to_read;j++) for (j = 0; j < words_to_read; j++)
{ {
while(!get_ethmac_mac_ctrl_rx_pending(ethmac)) while (!get_ethmac_mac_ctrl_rx_pending(ethmac))
; ;
// be carefull of unaligned accesses since data is 2byte aligned // be carefull of unaligned accesses since data is 2byte aligned
word = get_ethmac_mac_rx(ethmac); word = get_ethmac_mac_rx(ethmac);
memcpy(data + j * sizeof(UINT), &word, sizeof(UINT)); memcpy(data + j * sizeof(UINT), &word, sizeof(UINT));
} }
if(packet_ptr == NX_NULL) if (packet_ptr == NX_NULL)
{ {
/* No packet available. Drop it and continue. */ /* No packet available. Drop it and continue. */
return; return;
@@ -965,11 +999,11 @@ VOID _nx_mnrs_eth_recv_packet(UINT id, volatile ethmac_t* ethmac) {
/* Make sure IP header is 4-byte aligned. */ /* Make sure IP header is 4-byte aligned. */
packet_ptr->nx_packet_prepend_ptr += 2; packet_ptr->nx_packet_prepend_ptr += 2;
packet_ptr->nx_packet_append_ptr += 2; packet_ptr->nx_packet_append_ptr += 2;
if(data == nx_mnrs_receive_buffer) if (data == nx_mnrs_receive_buffer)
{ {
/* Copy data into packet. */ /* Copy data into packet. */
status = nx_packet_data_append(packet_ptr, (VOID *)data, bytes_received, status = nx_packet_data_append(
ip_ptr -> nx_ip_default_packet_pool, NX_NO_WAIT); packet_ptr, (VOID*)data, bytes_received, ip_ptr->nx_ip_default_packet_pool, NX_NO_WAIT);
if (status) if (status)
{ {
nx_packet_release(packet_ptr); nx_packet_release(packet_ptr);
@@ -989,15 +1023,17 @@ VOID _nx_mnrs_eth_recv_packet(UINT id, volatile ethmac_t* ethmac) {
set_ethmac_mac_intr_rx_data_avail_intr_enable(ethmac, 1); set_ethmac_mac_intr_rx_data_avail_intr_enable(ethmac, 1);
} }
VOID _nx_mnrs_eth_recv_packet_eth0(VOID) { VOID _nx_mnrs_eth_recv_packet_eth0(VOID)
if(get_ethmac_mac_ctrl_rx_pending(ethmac0)) {
if (get_ethmac_mac_ctrl_rx_pending(ethmac0))
{ {
_nx_mnrs_eth_recv_packet(0, ethmac0); _nx_mnrs_eth_recv_packet(0, ethmac0);
} }
} }
VOID _nx_mnrs_eth_recv_packet_eth1(VOID) { VOID _nx_mnrs_eth_recv_packet_eth1(VOID)
if(get_ethmac_mac_ctrl_rx_pending(ethmac1)) {
if (get_ethmac_mac_ctrl_rx_pending(ethmac1))
{ {
_nx_mnrs_eth_recv_packet(1, ethmac1); _nx_mnrs_eth_recv_packet(1, ethmac1);
} }