diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 07:44:08 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 07:44:08 (GMT) |
commit | 1d2a1959fe534279cf37aba20b08c24c20840e52 (patch) | |
tree | 67c0b9aa7fe22a44bf0b4af88947799203eb8f67 /drivers/staging/ath6kl/include/ar6000_diag.h | |
parent | 5a79ce76e9bb8f4b2cd8106ee36d15ee05013bcf (diff) | |
parent | 054cfaacf88865bff1dd58d305443d5d6c068a08 (diff) | |
download | linux-1d2a1959fe534279cf37aba20b08c24c20840e52.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'drivers/staging/ath6kl/include/ar6000_diag.h')
-rw-r--r-- | drivers/staging/ath6kl/include/ar6000_diag.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/ath6kl/include/ar6000_diag.h b/drivers/staging/ath6kl/include/ar6000_diag.h index b53512e..739c01c 100644 --- a/drivers/staging/ath6kl/include/ar6000_diag.h +++ b/drivers/staging/ath6kl/include/ar6000_diag.h @@ -25,24 +25,24 @@ #define AR6000_DIAG_H_ -A_STATUS -ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data); +int +ar6000_ReadRegDiag(struct hif_device *hifDevice, u32 *address, u32 *data); -A_STATUS -ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data); +int +ar6000_WriteRegDiag(struct hif_device *hifDevice, u32 *address, u32 *data); -A_STATUS -ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address, - A_UCHAR *data, A_UINT32 length); +int +ar6000_ReadDataDiag(struct hif_device *hifDevice, u32 address, + u8 *data, u32 length); -A_STATUS -ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address, - A_UCHAR *data, A_UINT32 length); +int +ar6000_WriteDataDiag(struct hif_device *hifDevice, u32 address, + u8 *data, u32 length); -A_STATUS -ar6k_ReadTargetRegister(HIF_DEVICE *hifDevice, int regsel, A_UINT32 *regval); +int +ar6k_ReadTargetRegister(struct hif_device *hifDevice, int regsel, u32 *regval); void -ar6k_FetchTargetRegs(HIF_DEVICE *hifDevice, A_UINT32 *targregs); +ar6k_FetchTargetRegs(struct hif_device *hifDevice, u32 *targregs); #endif /*AR6000_DIAG_H_*/ |