diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-05-15 04:31:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-05-15 04:31:16 -0700 |
| commit | 0debd0941eeaa9ae202e3610691efe80a1c335ce (patch) | |
| tree | 449452b1953e43ee2e8ea4a4abf293be63ce88d1 /include | |
| parent | 83a66c223853cc52b7d0d1d06307b6746ed83380 (diff) | |
| parent | 6373e8bb4c01bd887b3e2a303e52611657dd80d1 (diff) | |
Merge bk://kernel.bkbits.net/acme/net-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cyclomx.h | 4 | ||||
| -rw-r--r-- | include/linux/cycx_drv.h | 39 |
2 files changed, 24 insertions, 19 deletions
diff --git a/include/linux/cyclomx.h b/include/linux/cyclomx.h index a19aeebe7192..51a41067534a 100644 --- a/include/linux/cyclomx.h +++ b/include/linux/cyclomx.h @@ -44,8 +44,8 @@ * static data would do it. */ struct cycx_device { - char devname[WAN_DRVNAME_SZ+1]; /* card name */ - cycxhw_t hw; /* hardware configuration */ + char devname[WAN_DRVNAME_SZ + 1];/* card name */ + struct cycx_hw hw; /* hardware configuration */ struct wan_device wandev; /* WAN device data space */ u32 state_tick; /* link state timestamp */ spinlock_t lock; diff --git a/include/linux/cycx_drv.h b/include/linux/cycx_drv.h index 88b3f5f5116d..30294cc00297 100644 --- a/include/linux/cycx_drv.h +++ b/include/linux/cycx_drv.h @@ -3,7 +3,7 @@ * * Author: Arnaldo Carvalho de Melo <acme@conectiva.com.br> * -* Copyright: (c) 1998-2000 Arnaldo Carvalho de Melo +* Copyright: (c) 1998-2003 Arnaldo Carvalho de Melo * * Based on sdladrv.h by Gene Kozin <genek@compuserve.com> * @@ -41,24 +41,29 @@ #define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif -/* Data Structures */ -/* Adapter hardware configuration. Pointer to this structure is passed to all - * APIs. */ -typedef struct cycxhw { - u32 fwid; /* firmware ID */ - int irq; /* interrupt request level */ - u32 dpmbase; /* dual-port memory base */ - u32 dpmsize; /* dual-port memory size */ +/** + * struct cycx_hw - Adapter hardware configuration + * @fwid - firmware ID + * @irq - interrupt request level + * @dpmbase - dual-port memory base + * @dpmsize - dual-port memory size + * @reserved - reserved for future use + */ +struct cycx_hw { + u32 fwid; + int irq; + u32 dpmbase; + u32 dpmsize; u32 reserved[5]; -} cycxhw_t; +}; /* Function Prototypes */ -extern int cycx_setup (cycxhw_t *hw, void *sfm, u32 len); -extern int cycx_down (cycxhw_t *hw); -extern int cycx_peek (cycxhw_t *hw, u32 addr, void *buf, u32 len); -extern int cycx_poke (cycxhw_t *hw, u32 addr, void *buf, u32 len); -extern int cycx_exec (u32 addr); +extern int cycx_setup(struct cycx_hw *hw, void *sfm, u32 len); +extern int cycx_down(struct cycx_hw *hw); +extern int cycx_peek(struct cycx_hw *hw, u32 addr, void *buf, u32 len); +extern int cycx_poke(struct cycx_hw *hw, u32 addr, void *buf, u32 len); +extern int cycx_exec(u32 addr); -extern void cycx_inten (cycxhw_t *hw); -extern void cycx_intr (cycxhw_t *hw); +extern void cycx_inten(struct cycx_hw *hw); +extern void cycx_intr(struct cycx_hw *hw); #endif /* _CYCX_DRV_H */ |