Skip to content

Commit bd4c4e9

Browse files
committed
Address comments from reviews
1 parent 773596f commit bd4c4e9

File tree

2 files changed

+3
-58
lines changed

2 files changed

+3
-58
lines changed

source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_hw.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ void setup_isr( xemacpsif_s * xemacpsif )
4949
*/
5050
XEmacPs * xInstancePtr = &( xemacpsif->emacps );
5151

52-
xInstancePtr->SendHandler = ( XEmacPs_Handler ) emacps_send_handler;
52+
xInstancePtr->SendHandler = emacps_send_handler;
5353
xInstancePtr->SendRef = ( void * ) xemacpsif;
5454

55-
xInstancePtr->RecvHandler = ( XEmacPs_Handler ) emacps_recv_handler;
55+
xInstancePtr->RecvHandler = emacps_recv_handler;
5656
xInstancePtr->RecvRef = ( void * ) xemacpsif;
5757

58-
xInstancePtr->ErrorHandler = ( XEmacPs_ErrHandler ) emacps_error_handler;
58+
xInstancePtr->ErrorHandler = emacps_error_handler;
5959
xInstancePtr->ErrorRef = ( void * ) xemacpsif;
6060
}
6161

source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_physpeed.c

-55
Original file line numberDiff line numberDiff line change
@@ -245,18 +245,10 @@ void my_sleep( uint32_t uxTicks )
245245
u32 phymapemac0[ 32 ];
246246
u32 phymapemac1[ 32 ];
247247

248-
static uint16_t prvAR803x_debug_reg_read( XEmacPs * xemacpsp,
249-
uint32_t phy_addr,
250-
u16 reg );
251248
static uint16_t prvAR803x_debug_reg_write( XEmacPs * xemacpsp,
252249
uint32_t phy_addr,
253250
u16 reg,
254251
u16 value );
255-
static int prvAR803x_debug_reg_mask( XEmacPs * xemacpsp,
256-
uint32_t phy_addr,
257-
u16 reg,
258-
u16 clear,
259-
u16 set );
260252
static void prvSET_AR803x_TX_Timing( XEmacPs * xemacpsp,
261253
uint32_t phy_addr );
262254

@@ -832,32 +824,8 @@ static uint32_t get_AR8035_phy_speed( XEmacPs * xemacpsp,
832824
}
833825
}
834826

835-
static void ar8035Tick( XEmacPs * xemacpsp,
836-
uint32_t phy_addr )
837-
{
838-
uint16_t value;
839-
BaseType_t linkState;
840-
841-
/*Read basic status register */
842-
value = XEmacPs_PhyRead2( xemacpsp, phy_addr, IEEE_STATUS_REG_OFFSET );
843-
/*Retrieve current link state */
844-
linkState = ( value & IEEE_STAT_LINK_STATUS ) ? TRUE : FALSE;
845-
846-
/* Just to prevent compiler warnings about unused variable. */
847-
( void ) linkState;
848-
}
849-
850827
#define AR803X_DEBUG_ADDR 0x1D
851828
#define AR803X_DEBUG_DATA 0x1E
852-
static uint16_t prvAR803x_debug_reg_read( XEmacPs * xemacpsp,
853-
uint32_t phy_addr,
854-
u16 reg )
855-
{
856-
XEmacPs_PhyWrite( xemacpsp, phy_addr, AR803X_DEBUG_ADDR, reg );
857-
858-
return XEmacPs_PhyRead2( xemacpsp, phy_addr, AR803X_DEBUG_DATA );
859-
}
860-
861829
static uint16_t prvAR803x_debug_reg_write( XEmacPs * xemacpsp,
862830
uint32_t phy_addr,
863831
u16 reg,
@@ -868,29 +836,6 @@ static uint16_t prvAR803x_debug_reg_write( XEmacPs * xemacpsp,
868836
return XEmacPs_PhyWrite( xemacpsp, phy_addr, AR803X_DEBUG_DATA, value );
869837
}
870838

871-
static int prvAR803x_debug_reg_mask( XEmacPs * xemacpsp,
872-
uint32_t phy_addr,
873-
u16 reg,
874-
u16 clear,
875-
u16 set )
876-
{
877-
u16 val;
878-
int ret;
879-
880-
ret = prvAR803x_debug_reg_read( xemacpsp, phy_addr, reg );
881-
882-
if( ret < 0 )
883-
{
884-
return ret;
885-
}
886-
887-
val = ret & 0xffff;
888-
val &= ~clear;
889-
val |= set;
890-
891-
return XEmacPs_PhyWrite( xemacpsp, phy_addr, AR803X_DEBUG_DATA, val );
892-
}
893-
894839
static uint32_t ar8035CheckStatus( XEmacPs * xemacpsp,
895840
uint32_t phy_addr )
896841
{

0 commit comments

Comments
 (0)