Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37fce430 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

drivers/net/tlan: Remove TRUE/FALSE defines, use bool 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a60389ab

drivers/net/tlan.c

+14 −14
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static int TLan_PhyInternalService( struct net_device * ); 
static int	TLan_PhyDp83840aCheck( struct net_device * );

*/



static int	TLan_MiiReadReg( struct net_device *, u16, u16, u16 * );

static bool	TLan_MiiReadReg( struct net_device *, u16, u16, u16 * );

static void	TLan_MiiSendData( u16, u32, unsigned );

static void	TLan_MiiSync( u16 );

static void	TLan_MiiWriteReg( struct net_device *, u16, u16, u16 );
@@ -2204,7 +2204,7 @@ TLan_ResetAdapter( struct net_device *dev ) 
	u32		data;

	u8		data8;



	priv->tlanFullDuplex = FALSE;

	priv->tlanFullDuplex = false;

	priv->phyOnline=0;

	netif_carrier_off(dev);
@@ -2259,7 +2259,7 @@ TLan_ResetAdapter( struct net_device *dev ) 
			TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x0a );

		} else if ( priv->duplex == TLAN_DUPLEX_FULL ) {

			TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x00 );

			priv->tlanFullDuplex = TRUE;

			priv->tlanFullDuplex = true;

		} else {

			TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x08 );

		}
@@ -2651,14 +2651,14 @@ static void TLan_PhyStartLink( struct net_device *dev ) 
			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x0000);

		} else if ( priv->speed == TLAN_SPEED_10 &&

			    priv->duplex == TLAN_DUPLEX_FULL) {

			priv->tlanFullDuplex = TRUE;

			priv->tlanFullDuplex = true;

			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x0100);

		} else if ( priv->speed == TLAN_SPEED_100 &&

			    priv->duplex == TLAN_DUPLEX_HALF) {

			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x2000);

		} else if ( priv->speed == TLAN_SPEED_100 &&

			    priv->duplex == TLAN_DUPLEX_FULL) {

			priv->tlanFullDuplex = TRUE;

			priv->tlanFullDuplex = true;

			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x2100);

		} else {
@@ -2695,7 +2695,7 @@ static void TLan_PhyStartLink( struct net_device *dev ) 
                	tctl &= ~TLAN_TC_AUISEL;

			if ( priv->duplex == TLAN_DUPLEX_FULL ) {

				control |= MII_GC_DUPLEX;

				priv->tlanFullDuplex = TRUE;

				priv->tlanFullDuplex = true;

			}

			if ( priv->speed == TLAN_SPEED_100 ) {

				control |= MII_GC_SPEEDSEL;
@@ -2750,9 +2750,9 @@ static void TLan_PhyFinishAutoNeg( struct net_device *dev ) 
	TLan_MiiReadReg( dev, phy, MII_AN_LPA, &an_lpa );

	mode = an_adv & an_lpa & 0x03E0;

	if ( mode & 0x0100 ) {

		priv->tlanFullDuplex = TRUE;

		priv->tlanFullDuplex = true;

	} else if ( ! ( mode & 0x0080 ) && ( mode & 0x0040 ) ) {

		priv->tlanFullDuplex = TRUE;

		priv->tlanFullDuplex = true;

	}



	if ( ( ! ( mode & 0x0180 ) ) &&
@@ -2855,8 +2855,8 @@ void TLan_PhyMonitor( struct net_device *dev ) 
	 *	TLan_MiiReadReg

	 *

	 *	Returns:

	 *		0	if ack received ok

	 *		1	otherwise.

	 *		false	if ack received ok

	 *		true	if no ack received or other error

	 *

	 *	Parms:

	 *		dev		The device structure containing
@@ -2875,17 +2875,17 @@ void TLan_PhyMonitor( struct net_device *dev ) 
	 *

	 **************************************************************/



static int TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )

static bool TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )

{

	u8	nack;

	u16	sio, tmp;

 	u32	i;

	int	err;

	bool	err;

	int	minten;

	TLanPrivateInfo *priv = netdev_priv(dev);

	unsigned long flags = 0;



	err = FALSE;

	err = false;

	outw(TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR);

	sio = dev->base_addr + TLAN_DIO_DATA + TLAN_NET_SIO;
@@ -2918,7 +2918,7 @@ static int TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val ) 
			TLan_SetBit(TLAN_NET_SIO_MCLK, sio);

		}

		tmp = 0xffff;

		err = TRUE;

		err = true;

	} else {					/* ACK, so read data */

		for (tmp = 0, i = 0x8000; i; i >>= 1) {

			TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);

drivers/net/tlan.h

+0 −3
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ 
	 *

	 ****************************************************************/



#define FALSE			0

#define TRUE			1



#define TLAN_MIN_FRAME_SIZE	64

#define TLAN_MAX_FRAME_SIZE	1600