diff options
Diffstat (limited to 'drivers/bcm570x_lm.h')
| -rw-r--r-- | drivers/bcm570x_lm.h | 36 | 
1 files changed, 9 insertions, 27 deletions
| diff --git a/drivers/bcm570x_lm.h b/drivers/bcm570x_lm.h index 79073a8e4..607f3fd06 100644 --- a/drivers/bcm570x_lm.h +++ b/drivers/bcm570x_lm.h @@ -20,7 +20,6 @@  #include "bcm570x_bits.h" -  /******************************************************************************/  /* Basic types. */  /******************************************************************************/ @@ -50,13 +49,13 @@ typedef LM_UINT64 LM_PHYSICAL_ADDRESS, *PLM_PHYSICAL_ADDRESS;  /* void LM_INC_PHYSICAL_ADDRESS(PLM_PHYSICAL_ADDRESS pAddr,LM_UINT32 IncSize) */  #define LM_INC_PHYSICAL_ADDRESS(pAddr, IncSize)             \      {                                                       \ -        LM_UINT32 OrgLow;                                   \ -                                                            \ -        OrgLow = (pAddr)->Low;                              \ -        (pAddr)->Low += IncSize;                            \ -        if((pAddr)->Low < OrgLow) {                         \ -            (pAddr)->High++; /* Wrap around. */             \ -        }                                                   \ +	LM_UINT32 OrgLow;                                   \ +							    \ +	OrgLow = (pAddr)->Low;                              \ +	(pAddr)->Low += IncSize;                            \ +	if((pAddr)->Low < OrgLow) {                         \ +	    (pAddr)->High++; /* Wrap around. */             \ +	}                                                   \      } @@ -69,7 +68,6 @@ typedef LM_UINT64 LM_PHYSICAL_ADDRESS, *PLM_PHYSICAL_ADDRESS;  #endif /* OFFSETOF */ -  /******************************************************************************/  /* Simple macros. */  /******************************************************************************/ @@ -103,7 +101,6 @@ typedef LM_UINT64 LM_PHYSICAL_ADDRESS, *PLM_PHYSICAL_ADDRESS;      ((unsigned char *) (_Dst))[5] = ((unsigned char *) (_Src))[5]; -  /******************************************************************************/  /* Constants. */  /******************************************************************************/ @@ -133,7 +130,6 @@ typedef LM_UINT64 LM_PHYSICAL_ADDRESS, *PLM_PHYSICAL_ADDRESS;  #define LM_PROMISCUOUS_MODE             0x10000 -  /******************************************************************************/  /* PCI registers. */  /******************************************************************************/ @@ -191,12 +187,11 @@ typedef struct {  #define DECLARE_FRAG_LIST_BUFFER_TYPE(_FRAG_LIST_TYPE_NAME, _MAX_FRAG_COUNT) \      typedef struct {                                                         \ -        LM_FRAG_LIST FragList;                                               \ -        LM_FRAG FragListBuffer[_MAX_FRAG_COUNT-1];                           \ +	LM_FRAG_LIST FragList;                                               \ +	LM_FRAG FragListBuffer[_MAX_FRAG_COUNT-1];                           \      } _FRAG_LIST_TYPE_NAME, *P##_FRAG_LIST_TYPE_NAME -  /******************************************************************************/  /* Status codes. */  /******************************************************************************/ @@ -223,7 +218,6 @@ typedef struct {  typedef LM_UINT LM_STATUS, *PLM_STATUS; -  /******************************************************************************/  /* Requested media type. */  /******************************************************************************/ @@ -247,7 +241,6 @@ typedef LM_UINT LM_STATUS, *PLM_STATUS;  typedef LM_UINT32 LM_REQUESTED_MEDIA_TYPE, *PLM_REQUESTED_MEDIA_TYPE; -  /******************************************************************************/  /* Media type. */  /******************************************************************************/ @@ -262,7 +255,6 @@ typedef LM_UINT32 LM_REQUESTED_MEDIA_TYPE, *PLM_REQUESTED_MEDIA_TYPE;  typedef LM_UINT32 LM_MEDIA_TYPE, *PLM_MEDIA_TYPE; -  /******************************************************************************/  /* Line speed. */  /******************************************************************************/ @@ -275,7 +267,6 @@ typedef LM_UINT32 LM_MEDIA_TYPE, *PLM_MEDIA_TYPE;  typedef LM_UINT32 LM_LINE_SPEED, *PLM_LINE_SPEED; -  /******************************************************************************/  /* Duplex mode. */  /******************************************************************************/ @@ -287,7 +278,6 @@ typedef LM_UINT32 LM_LINE_SPEED, *PLM_LINE_SPEED;  typedef LM_UINT32 LM_DUPLEX_MODE, *PLM_DUPLEX_MODE; -  /******************************************************************************/  /* Power state. */  /******************************************************************************/ @@ -300,7 +290,6 @@ typedef LM_UINT32 LM_DUPLEX_MODE, *PLM_DUPLEX_MODE;  typedef LM_UINT32 LM_POWER_STATE, *PLM_POWER_STATE; -  /******************************************************************************/  /* Task offloading. */  /******************************************************************************/ @@ -317,7 +306,6 @@ typedef LM_UINT32 LM_POWER_STATE, *PLM_POWER_STATE;  typedef LM_UINT32 LM_TASK_OFFLOAD, *PLM_TASK_OFFLOAD; -  /******************************************************************************/  /* Flow control. */  /******************************************************************************/ @@ -337,7 +325,6 @@ typedef LM_UINT32 LM_TASK_OFFLOAD, *PLM_TASK_OFFLOAD;  typedef LM_UINT32 LM_FLOW_CONTROL, *PLM_FLOW_CONTROL; -  /******************************************************************************/  /* Wake up mode. */  /******************************************************************************/ @@ -350,7 +337,6 @@ typedef LM_UINT32 LM_FLOW_CONTROL, *PLM_FLOW_CONTROL;  typedef LM_UINT32 LM_WAKE_UP_MODE, *PLM_WAKE_UP_MODE; -  /******************************************************************************/  /* Counters. */  /******************************************************************************/ @@ -377,7 +363,6 @@ typedef LM_UINT32 LM_WAKE_UP_MODE, *PLM_WAKE_UP_MODE;  typedef LM_UINT32 LM_COUNTER_TYPE, *PLM_COUNTER_TYPE; -  /******************************************************************************/  /* Forward definition. */  /******************************************************************************/ @@ -386,7 +371,6 @@ typedef struct _LM_DEVICE_BLOCK *PLM_DEVICE_BLOCK;  typedef struct _LM_PACKET *PLM_PACKET; -  /******************************************************************************/  /* Function prototypes. */  /******************************************************************************/ @@ -427,7 +411,6 @@ LM_STATUS LM_SetupPhy(PLM_DEVICE_BLOCK pDevice);  int LM_BlinkLED(PLM_DEVICE_BLOCK pDevice, LM_UINT32 BlinkDuration); -  /******************************************************************************/  /* These are the OS specific functions called by LMAC. */  /******************************************************************************/ @@ -466,4 +449,3 @@ LM_STATUS LM_Load5703DmaWFirmware(PLM_DEVICE_BLOCK pDevice);  #endif /* LM_H */ - |