diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-02 18:49:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-02 18:49:32 +1000 |
| commit | ba4ccd8831a8174e533cb02d03134a512e4ea79b (patch) | |
| tree | b3be2e92ab11ef568ff5ccba47989e6d5950222c /drivers/staging/vt6655/srom.h | |
| parent | c23553f91afc3d030b45bfbf637a08698558ff9b (diff) | |
| parent | a6ab2b64c43054920f41332ab12e853997d467cf (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/vt6655/srom.h')
| -rw-r--r-- | drivers/staging/vt6655/srom.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/drivers/staging/vt6655/srom.h b/drivers/staging/vt6655/srom.h index a4ca5f0b196d..ba123ee61d24 100644 --- a/drivers/staging/vt6655/srom.h +++ b/drivers/staging/vt6655/srom.h @@ -27,18 +27,13 @@ * */ - #ifndef __SROM_H__ #define __SROM_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - /*--------------------- Export Definitions -------------------------*/ - #define EEP_MAX_CONTEXT_SIZE 256 #define CB_EEPROM_READBYTE_WAIT 900 //us @@ -48,7 +43,6 @@ // // Contents in the EEPROM // - #define EEP_OFS_PAR 0x00 // physical address #define EEP_OFS_ANTENNA 0x16 #define EEP_OFS_RADIOCTL 0x17 @@ -97,8 +91,6 @@ #define EEP_RADIOCTL_ENABLE 0x80 #define EEP_RADIOCTL_INV 0x01 - - /*--------------------- Export Types ------------------------------*/ // AT24C02 eeprom contents @@ -133,7 +125,7 @@ typedef struct tagSSromReg { BYTE abyReserved0[96]; // 0x10 (WORD) BYTE abyCIS[128]; // 0x80 (WORD) -} SSromReg, DEF* PSSromReg; +} SSromReg, *PSSromReg; /*--------------------- Export Macros ------------------------------*/ @@ -142,10 +134,6 @@ typedef struct tagSSromReg { /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - BYTE SROMbyReadEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset); BOOL SROMbWriteEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byData); @@ -166,14 +154,4 @@ VOID SROMvReadSubSysVenId(DWORD_PTR dwIoBase, PDWORD pdwSubSysVenId); BOOL SROMbAutoLoad (DWORD_PTR dwIoBase); - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __EEPROM_H__ - - |