Commit 1210db95 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

Staging: et131x: phy clean up 



Clean up the phy code a bit so we can see what needs doing. This involves
moving blocks around and making stuff static

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 57aed3b4

drivers/staging/et131x/et1310_phy.c

+580 −578

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/et131x/et1310_phy.h

+2 −28
Original line number Diff line number Diff line
@@ -739,25 +739,15 @@ typedef union _MI_LCR2_t { 
/* Forward declaration of the private adapter structure */

struct et131x_adapter;



/* OS Specific Functions*/

void TPAL_SetPhy10HalfDuplex(struct et131x_adapter *adapter);

void TPAL_SetPhy10FullDuplex(struct et131x_adapter *adapter);

void TPAL_SetPhy10Force(struct et131x_adapter *pAdapter);

void TPAL_SetPhy100HalfDuplex(struct et131x_adapter *adapter);

void TPAL_SetPhy100FullDuplex(struct et131x_adapter *adapter);

void TPAL_SetPhy100Force(struct et131x_adapter *pAdapter);

void TPAL_SetPhy1000FullDuplex(struct et131x_adapter *adapter);

void TPAL_SetPhyAutoNeg(struct et131x_adapter *adapter);



/* Prototypes for ET1310_phy.c */

int et131x_xcvr_find(struct et131x_adapter *adapter);

int et131x_setphy_normal(struct et131x_adapter *adapter);

int32_t PhyMiRead(struct et131x_adapter *adapter,

	       u8 xcvrAddr, u8 xcvrReg, u16 *value);



/* static inline function does not work because et131x_adapter is not always

 * defined

 */

int PhyMiRead(struct et131x_adapter *adapter, u8 xcvrAddr,

	      u8 xcvrReg, u16 *value);

#define MiRead(adapter, xcvrReg, value) \

	PhyMiRead((adapter), (adapter)->Stats.xcvr_addr, (xcvrReg), (value))
@@ -857,24 +847,8 @@ void SetPhy_10BaseTHalfDuplex(struct et131x_adapter *adapter); 
void ET1310_PhyInit(struct et131x_adapter *adapter);

void ET1310_PhyReset(struct et131x_adapter *adapter);

void ET1310_PhyPowerDown(struct et131x_adapter *adapter, bool down);

void ET1310_PhyAutoNeg(struct et131x_adapter *adapter, bool enable);

void ET1310_PhyDuplexMode(struct et131x_adapter *adapter, u16 duplex);

void ET1310_PhySpeedSelect(struct et131x_adapter *adapter, u16 speed);

void ET1310_PhyAdvertise1000BaseT(struct et131x_adapter *adapter,

				  u16 duplex);

void ET1310_PhyAdvertise100BaseT(struct et131x_adapter *adapter,

				 u16 duplex);

void ET1310_PhyAdvertise10BaseT(struct et131x_adapter *adapter,

				u16 duplex);

void ET1310_PhyLinkStatus(struct et131x_adapter *adapter,

			  u8 *Link_status,

			  u32 *autoneg,

			  u32 *linkspeed,

			  u32 *duplex_mode,

			  u32 *mdi_mdix,

			  u32 *masterslave, u32 *polarity);

void ET1310_PhyAndOrReg(struct et131x_adapter *adapter,

			u16 regnum, u16 andMask, u16 orMask);

void ET1310_PhyAccessMiBit(struct et131x_adapter *adapter,

			   u16 action,

			   u16 regnum, u16 bitnum, u8 *value);

CRA Git | Maintained and supported by SUSTech CRA and CCSE