mirror of
https://github.com/logicog/RTLPlayground.git
synced 2026-08-30 14:52:51 +08:00
Merge branch 'logicog:main' into syslog
This commit is contained in:
+4
-4
@@ -64,7 +64,7 @@
|
||||
*
|
||||
*/
|
||||
void
|
||||
timer_set(struct timer *t, clock_time_t interval)
|
||||
timer_set(__xdata struct timer *t, clock_time_t interval)
|
||||
{
|
||||
t->interval = interval;
|
||||
t->start = clock_time();
|
||||
@@ -84,7 +84,7 @@ timer_set(struct timer *t, clock_time_t interval)
|
||||
* \sa timer_restart()
|
||||
*/
|
||||
void
|
||||
timer_reset(struct timer *t)
|
||||
timer_reset(__xdata struct timer *t)
|
||||
{
|
||||
t->start += t->interval;
|
||||
}
|
||||
@@ -104,7 +104,7 @@ timer_reset(struct timer *t)
|
||||
* \sa timer_reset()
|
||||
*/
|
||||
void
|
||||
timer_restart(struct timer *t)
|
||||
timer_restart(__xdata struct timer *t)
|
||||
{
|
||||
t->start = clock_time();
|
||||
}
|
||||
@@ -121,7 +121,7 @@ timer_restart(struct timer *t)
|
||||
*
|
||||
*/
|
||||
int
|
||||
timer_expired(struct timer *t)
|
||||
timer_expired(__xdata struct timer *t)
|
||||
{
|
||||
return (clock_time_t)(clock_time() - t->start) >= (clock_time_t)t->interval;
|
||||
}
|
||||
|
||||
+4
-4
@@ -76,10 +76,10 @@ struct timer {
|
||||
clock_time_t interval;
|
||||
};
|
||||
|
||||
void timer_set(struct timer *t, clock_time_t interval);
|
||||
void timer_reset(struct timer *t);
|
||||
void timer_restart(struct timer *t);
|
||||
int timer_expired(struct timer *t);
|
||||
void timer_set(__xdata struct timer *t, clock_time_t interval);
|
||||
void timer_reset(__xdata struct timer *t);
|
||||
void timer_restart(__xdata struct timer *t);
|
||||
int timer_expired(__xdata struct timer *t);
|
||||
|
||||
#endif /* __TIMER_H__ */
|
||||
|
||||
|
||||
@@ -241,7 +241,7 @@ __xdata struct uip_stats uip_stat;
|
||||
|
||||
#if ! UIP_ARCH_ADD32
|
||||
void
|
||||
uip_add32(u8_t *op32, u16_t op16)
|
||||
uip_add32(u8_t __xdata * op32, u16_t op16)
|
||||
{
|
||||
uip_acc32[3] = op32[3] + (op16 & 0xff);
|
||||
uip_acc32[2] = op32[2] + (op16 >> 8);
|
||||
@@ -465,8 +465,8 @@ uip_connect(register __xdata uip_ipaddr_t *ripaddr, __xdata u16_t rport) __banke
|
||||
#endif /* UIP_ACTIVE_OPEN */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if UIP_UDP
|
||||
struct uip_udp_conn *
|
||||
uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport) __banked
|
||||
__xdata struct uip_udp_conn *
|
||||
uip_udp_new(__xdata uip_ipaddr_t *ripaddr, __xdata u16_t rport) __banked
|
||||
{
|
||||
__xdata struct uip_udp_conn *conn;
|
||||
|
||||
@@ -1901,7 +1901,7 @@ htons(u16_t val)
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
uip_send(register __xdata const void *data, register uint16_t len) __banked
|
||||
uip_send(__xdata const void *data, __xdata uint16_t len) __banked
|
||||
{
|
||||
if(len > 0) {
|
||||
uip_slen = len;
|
||||
|
||||
@@ -495,7 +495,7 @@ void uip_unlisten(u16_t port) __banked;
|
||||
* or NULL if no connection could be allocated.
|
||||
*
|
||||
*/
|
||||
__xdata struct uip_conn *uip_connect(register __xdata uip_ipaddr_t *ripaddr, __xdata u16_t port) __banked;
|
||||
__xdata struct uip_conn *uip_connect(__xdata uip_ipaddr_t *ripaddr, __xdata u16_t port) __banked;
|
||||
|
||||
|
||||
|
||||
@@ -535,7 +535,7 @@ __xdata struct uip_conn *uip_connect(register __xdata uip_ipaddr_t *ripaddr, __x
|
||||
*
|
||||
* \hideinitializer
|
||||
*/
|
||||
void uip_send(register __xdata const void *data, register uint16_t len) __banked;
|
||||
void uip_send(__xdata const void *data, __xdata uint16_t len) __banked;
|
||||
|
||||
/**
|
||||
* The length of any incoming data that is currently avaliable (if avaliable)
|
||||
@@ -763,7 +763,7 @@ void uip_send(register __xdata const void *data, register uint16_t len) __banked
|
||||
* \return The uip_udp_conn structure for the new connection or NULL
|
||||
* if no connection could be allocated.
|
||||
*/
|
||||
struct uip_udp_conn *uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport) __banked;
|
||||
__xdata struct uip_udp_conn *uip_udp_new(__xdata uip_ipaddr_t *ripaddr, __xdata u16_t rport) __banked;
|
||||
|
||||
/**
|
||||
* Removed a UDP connection.
|
||||
@@ -880,8 +880,8 @@ struct uip_udp_conn *uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport) __banked;
|
||||
*/
|
||||
#if !UIP_CONF_IPV6
|
||||
#define uip_ipaddr_copy(dest, src) do { \
|
||||
((u16_t *)dest)[0] = ((u16_t *)src)[0]; \
|
||||
((u16_t *)dest)[1] = ((u16_t *)src)[1]; \
|
||||
((__xdata u16_t *)dest)[0] = ((__xdata u16_t *)src)[0]; \
|
||||
((__xdata u16_t *)dest)[1] = ((__xdata u16_t *)src)[1]; \
|
||||
} while(0)
|
||||
#else /* !UIP_CONF_IPV6 */
|
||||
#define uip_ipaddr_copy(dest, src) memcpy(dest, src, sizeof(uip_ip6addr_t))
|
||||
@@ -908,8 +908,8 @@ struct uip_udp_conn *uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport) __banked;
|
||||
* \hideinitializer
|
||||
*/
|
||||
#if !UIP_CONF_IPV6
|
||||
#define uip_ipaddr_cmp(addr1, addr2) (((__xdata u16_t *)addr1)[0] == ((u16_t *)addr2)[0] && \
|
||||
((__xdata u16_t *)addr1)[1] == ((u16_t *)addr2)[1])
|
||||
#define uip_ipaddr_cmp(addr1, addr2) (((__xdata u16_t *)addr1)[0] == ((__xdata u16_t *)addr2)[0] && \
|
||||
((__xdata u16_t *)addr1)[1] == ((__xdata u16_t *)addr2)[1])
|
||||
#define uip_ipaddr_cmpx(addr1, addr2) (((__xdata u16_t *)addr1)[0] == ((__xdata u16_t *)addr2)[0] && \
|
||||
((__xdata u16_t *)addr1)[1] == ((__xdata u16_t *)addr2)[1])
|
||||
#define uip_ipaddr_cmpc(addr1, addr2) (((__xdata u16_t *)addr1)[0] == ((__code u16_t *)addr2)[0] && \
|
||||
|
||||
+1
-1
@@ -81,7 +81,7 @@
|
||||
*
|
||||
* \param op16 A 16-bit integer in host byte order.
|
||||
*/
|
||||
void uip_add32(u8_t *op32, u16_t op16);
|
||||
void uip_add32(__xdata u8_t * op32, u16_t op16);
|
||||
|
||||
/**
|
||||
* Calculate the Internet checksum over a buffer.
|
||||
|
||||
Reference in New Issue
Block a user