Skip to content

Commit 297ead7

Browse files
authored
Use custom isr name for network device driver (#290)
* rollback atmel start custom Ethernet handler change * allow microchip assert with different name
1 parent 6c96557 commit 297ead7

File tree

6 files changed

+3
-10
lines changed

6 files changed

+3
-10
lines changed

Microchip/ATSAME54-XPRO/app/startup/gnu/startup_same54.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ const DeviceVectors _vectors = {
388388
.pvReserved83 = (void*) (0UL), /* 83 Reserved */
389389
#endif
390390
#ifdef ID_GMAC
391-
.pfnGMAC_Handler = (void*) GMAC_Handler, /* 84 Ethernet MAC */
391+
.pfnGMAC_Handler = (void*) __nx_driver_same54_ethernet_isr, /* 84 Ethernet MAC */
392392
#else
393393
.pvReserved84 = (void*) (0UL), /* 84 Reserved */
394394
#endif

Microchip/ATSAME54-XPRO/app/startup/iar/startup_same54.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ const intvec_elem __vector_table[] =
382382
(0UL), /* 83 Reserved */
383383
#endif
384384
#ifdef ID_GMAC
385-
GMAC_Handler, /* 84 Ethernet MAC */
385+
__nx_driver_same54_ethernet_isr, /* 84 Ethernet MAC */
386386
#else
387387
(0UL), /* 84 Reserved */
388388
#endif

Microchip/ATSAME54-XPRO/lib/atmel_start/src/hal/utils/include/utils_assert.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ extern "C" {
8585
* \param[in] file File name
8686
* \param[in] line Line number
8787
*/
88-
//void assert(const bool condition, const char *const file, const int line);
88+
void asf_assert(const bool condition, const char *const file, const int line);
8989

9090
#ifdef __cplusplus
9191
}

Microchip/ATSAME54-XPRO/lib/atmel_start/src/hpl/gmac/hpl_gmac.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ static void _mac_init_bufdescr(struct _mac_async_device *const dev)
145145
hri_gmac_write_RBQB_reg(dev->hw, (uint32_t)_rxbuf_descrs);
146146
}
147147

148-
#if 0
149-
// Already defined at lib/netx_driver/nx_driver_same54_low_level.s
150148
/*
151149
* \internal GMAC interrupt handler
152150
*/
@@ -176,7 +174,6 @@ void GMAC_Handler(void)
176174
}
177175
hri_gmac_write_RSR_reg(_gmac_dev->hw, rsr);
178176
}
179-
#endif
180177

181178
int32_t _mac_async_init(struct _mac_async_device *const dev, void *const hw)
182179
{

Microchip/ATSAME54-XPRO/lib/netx_driver/src/gnu/nx_driver_same54_low_level.S

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,8 @@
6767
@/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
6868
@/* */
6969
@/**************************************************************************/
70-
.global GMAC_Handler
7170
.global __nx_driver_same54_ethernet_isr
7271
.thumb_func
73-
GMAC_Handler:
7472
.thumb_func
7573
__nx_driver_same54_ethernet_isr:
7674
PUSH {r0, lr}

Microchip/ATSAME54-XPRO/lib/netx_driver/src/iar/nx_driver_same54_low_level.s

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@
7070
;/* resulting in version 6.x. */
7171
;/* */
7272
;/**************************************************************************/
73-
PUBLIC GMAC_Handler
7473
PUBLIC __nx_driver_same54_ethernet_isr
75-
GMAC_Handler:
7674
__nx_driver_same54_ethernet_isr:
7775
PUSH {r0, lr}
7876
#ifdef TX_ENABLE_EXECUTION_CHANGE_NOTIFY

0 commit comments

Comments
 (0)