Skip to content

Commit 4d8baa7

Browse files
committed
emac targets: fix thread cb type
1 parent df821aa commit 4d8baa7

File tree

9 files changed

+16
-16
lines changed

9 files changed

+16
-16
lines changed

features/netsocket/emac-drivers/TARGET_Freescale_EMAC/kinetis_emac.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class Kinetis_EMAC : public EMAC {
149149
void phy_task();
150150
static void ethernet_callback(ENET_Type *base, enet_handle_t *handle, enet_event_t event, void *param);
151151

152-
os_thread_t thread_cb;
152+
mbed_rtos_storage_thread_t thread_cb;
153153
osThreadId_t thread; /**< Processing thread */
154154
rtos::Mutex TXLockMutex;/**< TX critical section mutex */
155155
rtos::Semaphore xTXDCountSem; /**< TX free buffer counting semaphore */

features/netsocket/emac-drivers/TARGET_NUVOTON_EMAC/numaker_emac.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ NUMAKER_EMAC::NUMAKER_EMAC() : thread(0), hwaddr()
5858
{
5959
}
6060

61-
static osThreadId_t create_new_thread(const char *threadName, void (*thread)(void *arg), void *arg, int stacksize, osPriority_t priority, os_thread_t *thread_cb)
61+
static osThreadId_t create_new_thread(const char *threadName, void (*thread)(void *arg), void *arg, int stacksize, osPriority_t priority, mbed_rtos_storage_thread_t *thread_cb)
6262
{
6363
osThreadAttr_t attr = {0};
6464
attr.name = threadName;
6565
attr.stack_mem = malloc(stacksize);
6666
attr.cb_mem = thread_cb;
6767
attr.stack_size = stacksize;
68-
attr.cb_size = sizeof(os_thread_t);
68+
attr.cb_size = sizeof(mbed_rtos_storage_thread_t);
6969
attr.priority = priority;
7070
return osThreadNew(thread, arg, &attr);
7171
}

features/netsocket/emac-drivers/TARGET_NUVOTON_EMAC/numaker_emac.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ class NUMAKER_EMAC : public EMAC {
146146
void phy_task();
147147
static void ethernet_callback(char event, void *param);
148148

149-
os_thread_t thread_cb;
149+
mbed_rtos_storage_thread_t thread_cb;
150150
osThreadId_t thread; /**< Processing thread */
151151
rtos::Mutex TXLockMutex;/**< TX critical section mutex */
152152
rtos::Semaphore xTXDCountSem; /**< TX free buffer counting semaphore */

features/netsocket/emac-drivers/TARGET_NXP_EMAC/TARGET_LPC546XX/lpc546xx_emac.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ LPC546XX_EMAC::LPC546XX_EMAC() : xTXDCountSem(ENET_TX_RING_LEN, ENET_TX_RING_LEN
6060
{
6161
}
6262

63-
static osThreadId_t create_new_thread(const char *threadName, void (*thread)(void *arg), void *arg, int stacksize, osPriority_t priority, os_thread_t *thread_cb)
63+
static osThreadId_t create_new_thread(const char *threadName, void (*thread)(void *arg), void *arg, int stacksize, osPriority_t priority, mbed_rtos_storage_thread_t *thread_cb)
6464
{
6565
osThreadAttr_t attr = {0};
6666
attr.name = threadName;
6767
attr.stack_mem = malloc(stacksize);
6868
attr.cb_mem = thread_cb;
6969
attr.stack_size = stacksize;
70-
attr.cb_size = sizeof(os_thread_t);
70+
attr.cb_size = sizeof(mbed_rtos_storage_thread_t);
7171
attr.priority = priority;
7272
return osThreadNew(thread, arg, &attr);
7373
}

features/netsocket/emac-drivers/TARGET_NXP_EMAC/TARGET_LPC546XX/lpc546xx_emac.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class LPC546XX_EMAC : public EMAC {
149149
void phy_task();
150150
static void ethernet_callback(ENET_Type *base, enet_handle_t *handle, enet_event_t event, uint8_t channel, void *param);
151151

152-
os_thread_t thread_cb;
152+
mbed_rtos_storage_thread_t thread_cb;
153153
osThreadId_t thread; /**< Processing thread */
154154
rtos::Mutex TXLockMutex;/**< TX critical section mutex */
155155
rtos::Semaphore xTXDCountSem; /**< TX free buffer counting semaphore */

features/netsocket/emac-drivers/TARGET_NXP_EMAC/TARGET_LPCTarget/lpc17_emac.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,14 @@ ETHMEM_SECTION uint8_t tx_clean_thread_stack[DEFAULT_THREAD_STACKSIZE];
169169
#endif
170170
ETHMEM_SECTION uint8_t phy_thread_stack[DEFAULT_THREAD_STACKSIZE];
171171

172-
static osThreadId_t create_new_thread(const char *threadName, void (*thread)(void *arg), void *arg, void *stack_ptr, int stacksize, osPriority_t priority, os_thread_t *thread_cb)
172+
static osThreadId_t create_new_thread(const char *threadName, void (*thread)(void *arg), void *arg, void *stack_ptr, int stacksize, osPriority_t priority, mbed_rtos_storage_thread_t *thread_cb)
173173
{
174174
osThreadAttr_t attr = {0};
175175
attr.name = threadName;
176176
attr.stack_mem = stack_ptr;
177177
attr.cb_mem = thread_cb;
178178
attr.stack_size = stacksize;
179-
attr.cb_size = sizeof(os_thread_t);
179+
attr.cb_size = sizeof(mbed_rtos_storage_thread_t);
180180
attr.priority = priority;
181181
return osThreadNew(thread, arg, &attr);
182182
}

features/netsocket/emac-drivers/TARGET_NXP_EMAC/TARGET_LPCTarget/lpc17_emac.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class LPC17_EMAC : public EMAC {
151151
void update_link_status(bool up);
152152

153153
osThreadId_t RxThread;
154-
os_thread_t RxThread_cb;
154+
mbed_rtos_storage_thread_t RxThread_cb;
155155
rtos::Semaphore TxCleanSem;
156156

157157
private:
@@ -176,9 +176,9 @@ class LPC17_EMAC : public EMAC {
176176
uint8_t hwaddr[6];
177177

178178
osThreadId_t TxCleanThread;
179-
os_thread_t TxCleanThread_cb;
179+
mbed_rtos_storage_thread_t TxCleanThread_cb;
180180
osThreadId_t PhyThread;
181-
os_thread_t PhyThread_cb;
181+
mbed_rtos_storage_thread_t PhyThread_cb;
182182
rtos::Mutex TXLockMutex;
183183
rtos::Semaphore xTXDCountSem;
184184

features/netsocket/emac-drivers/TARGET_STM_EMAC/stm32xx_emac.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ STM32_EMAC::STM32_EMAC()
8989
{
9090
}
9191

92-
static osThreadId_t create_new_thread(const char *threadName, void (*thread)(void *arg), void *arg, int stacksize, osPriority_t priority, os_thread_t *thread_cb)
92+
static osThreadId_t create_new_thread(const char *threadName, void (*thread)(void *arg), void *arg, int stacksize, osPriority_t priority, mbed_rtos_storage_thread_t *thread_cb)
9393
{
9494
osThreadAttr_t attr = {0};
9595
attr.name = threadName;
9696
attr.stack_mem = malloc(stacksize);
9797
attr.cb_mem = thread_cb;
9898
attr.stack_size = stacksize;
99-
attr.cb_size = sizeof(os_thread_t);
99+
attr.cb_size = sizeof(mbed_rtos_storage_thread_t);
100100
attr.priority = priority;
101101
return osThreadNew(thread, arg, &attr);
102102
}

features/netsocket/emac-drivers/TARGET_STM_EMAC/stm32xx_emac.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ class STM32_EMAC : public EMAC {
161161
void enable_interrupts();
162162
void disable_interrupts();
163163

164-
os_thread_t thread_cb;
164+
mbed_rtos_storage_thread_t thread_cb;
165165
#if defined (STM32F767xx) || defined (STM32F769xx) || defined (STM32F777xx)\
166166
|| defined (STM32F779xx)
167-
os_thread_t rmii_watchdog_thread_cb;
167+
mbed_rtos_storage_thread_t rmii_watchdog_thread_cb;
168168
osThreadId_t rmii_watchdog_thread; /**< Watchdog processing thread */
169169
#endif
170170
rtos::Mutex TXLockMutex;/**< TX critical section mutex */

0 commit comments

Comments
 (0)