This commit is contained in:
pvvx 2018-01-20 20:54:53 +03:00
parent 30b951832c
commit 39a516cd39
22 changed files with 98 additions and 3346 deletions

View file

@ -665,7 +665,7 @@ int wifi_run(rtw_mode_t mode) {
#ifdef USE_NETBIOS
netbios_set_name(WLAN_ST_NETIF_NUM, lwip_host_name[0]);
#endif
#endif
#endif // WIP_NETIF_HOSTNAME
netif_set_addr(&xnetif[WLAN_ST_NETIF_NUM], (ip_addr_t *) &wifi_st_dhcp.ip,
(ip_addr_t *) &wifi_st_dhcp.mask, (ip_addr_t *) &wifi_st_dhcp.gw);
pnif = &xnetif[WLAN_AP_NETIF_NUM];
@ -675,7 +675,7 @@ int wifi_run(rtw_mode_t mode) {
#ifdef USE_NETBIOS
netbios_set_name(WLAN_AP_NETIF_NUM, lwip_host_name[1]);
#endif
#endif
#endif // WIP_NETIF_HOSTNAME
netif_set_addr(&xnetif[WLAN_AP_NETIF_NUM], (ip_addr_t *) &wifi_ap_dhcp.ip,
(ip_addr_t *) &wifi_ap_dhcp.mask, (ip_addr_t *) &wifi_ap_dhcp.gw);

View file

@ -41,7 +41,7 @@ int32_t log_uart_init (log_uart_t *obj, int baudrate, int data_bits, SerialParit
{
HAL_LOG_UART_ADAPTER *pUartAdapter;
int i;
HalLogUartWaitTxFifoEmpty();
_memset((void*)obj, 0, sizeof(log_uart_t));
pUartAdapter = &obj->log_hal_uart;
// Check Baud rate

View file

@ -621,6 +621,7 @@ void sys_assert( const char *msg )
;
}
/*
u32_t sys_now(void)
{
return xTaskGetTickCount();
@ -630,3 +631,5 @@ u32_t sys_jiffies(void)
{
return xTaskGetTickCount();
}
*/

View file

@ -229,14 +229,16 @@ sys_thread_t sys_thread_new(const char *name, lwip_thread_fn thread, void *arg,
/* sys_init() must be called before anthing else. */
void sys_init(void);
#ifndef sys_jiffies
/** Ticks/jiffies since power up. */
u32_t sys_jiffies(void);
#ifndef sys_jiffies
#define sys_jiffies() xTaskGetTickCount()
//u32_t sys_jiffies(void);
#endif
/** Returns the current time in milliseconds,
* may be the same as sys_jiffies or at least based on it. */
u32_t sys_now(void);
#define sys_now() xTaskGetTickCount()
//u32_t sys_now(void);
/* Critical Region Protection */
/* These functions must be implemented in the sys_arch.c file.