gitproxy/RTLPlayground
1
0
Fork 0
mirror of https://github.com/logicog/RTLPlayground.git synced 2026-09-02 15:02:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream/main into the Spanning Tree branch

Browse Source 
Both conflicts are the register keyword removal meeting a change of ours,
so each takes main's signature and keeps what the branch was saying:
nic_rx_packet() still returns a bool, and port_ingress_filter_get() stays
declared.

main has since put its own copy of the STP module in BANK2, so the pragma
this branch carried is now duplicated. The one with main's comment stays.
This commit is contained in:
d00f
2026-08-30 21:58:54 +02:00
parent 75b223223c fc3c686564
commit 7f0e7fdc82
21 changed files with 366 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rtlplayground.c
+8 -8
View File
@@ -314,20 +314,20 @@ void memcpy(__xdata void * __xdata dst, __xdata const void * __xdata src, uint16
*d++ = *s++;
}
void memcpyc(register __xdata uint8_t *dst, register __code uint8_t *src, register uint16_t len)
void memcpyc(__xdata uint8_t *dst, __code uint8_t *src, uint16_t len)
{
while (len--)
*dst++ = *src++;
}
void memset(register __xdata uint8_t *dst, register __xdata uint8_t v, register uint8_t len)
void memset(__xdata uint8_t *dst, __xdata uint8_t v, uint8_t len)
{
while (len--)
*dst++ = v;
}
uint16_t strtox(register __xdata uint8_t *dst, register __code const char *s)
uint16_t strtox(__xdata uint8_t *dst, __code const char *s)
{
__xdata uint8_t *b = dst;
while (*s)
@@ -337,7 +337,7 @@ uint16_t strtox(register __xdata uint8_t *dst, register __code const char *s)
}
uint16_t strlen(register __code const char *s)
uint16_t strlen(__code const char *s)
{
uint16_t l = 0;
while (s[l])
@@ -346,7 +346,7 @@ uint16_t strlen(register __code const char *s)
}
uint16_t strlen_x(register __xdata const char *s)
uint16_t strlen_x(__xdata const char *s)
{
uint16_t l = 0;
while (s[l])
@@ -355,7 +355,7 @@ uint16_t strlen_x(register __xdata const char *s)
}
char strcmp(register __xdata const uint8_t *a, register __code const uint8_t *b)
char strcmp(__xdata const uint8_t *a, __code const uint8_t *b)
{
uint8_t i = 0;
@@ -678,7 +678,7 @@ bool nic_rx_header(uint16_t ring_ptr)
* data will be returned in the xmem buffer points to
* ring_ptr is the current position of the RX Ring on the ASIC side
*/
bool nic_rx_packet(register uint16_t buffer, register uint16_t ring_ptr)
bool nic_rx_packet(uint16_t buffer, uint16_t ring_ptr)
{
uint16_t guard = 0;
@@ -1252,7 +1252,7 @@ void handle_tx(void)
}
static inline uint8_t sfp_rate_to_sds_config(register uint8_t rate)
static inline uint8_t sfp_rate_to_sds_config(uint8_t rate)
{
if (rate == 0x1 || rate == 0x2)
return SDS_100FX;