92 lines
2.3 KiB
Diff
92 lines
2.3 KiB
Diff
From 6c628a539fe6953bfe6112d75c7fbb1f9409a086 Mon Sep 17 00:00:00 2001
|
|
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Sun, 28 Jun 2009 15:49:17 +0100
|
|
Subject: [PATCH] rt2870sta: constify RTUSBMultiWrite(), RTUSBFirmwareWrite()
|
|
|
|
These functions do not modify the data they are passed.
|
|
---
|
|
drivers/staging/rt2860/rtmp.h | 6 +++---
|
|
drivers/staging/rt2870/common/rtusb_io.c | 10 +++++-----
|
|
2 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
|
|
index 90fd40f..d283256 100644
|
|
--- a/drivers/staging/rt2860/rtmp.h
|
|
+++ b/drivers/staging/rt2860/rtmp.h
|
|
@@ -6095,13 +6095,13 @@ NTSTATUS RTUSBMultiRead(
|
|
NTSTATUS RTUSBMultiWrite(
|
|
IN PRTMP_ADAPTER pAd,
|
|
IN USHORT Offset,
|
|
- IN PUCHAR pData,
|
|
+ IN const u8 *pData,
|
|
IN USHORT length);
|
|
|
|
NTSTATUS RTUSBMultiWrite_OneByte(
|
|
IN PRTMP_ADAPTER pAd,
|
|
IN USHORT Offset,
|
|
- IN PUCHAR pData);
|
|
+ IN const u8 *pData);
|
|
|
|
NTSTATUS RTUSBReadBBPRegister(
|
|
IN PRTMP_ADAPTER pAd,
|
|
@@ -6220,7 +6220,7 @@ NTSTATUS RTUSBFirmwareRun(
|
|
|
|
NTSTATUS RTUSBFirmwareWrite(
|
|
IN PRTMP_ADAPTER pAd,
|
|
- IN PUCHAR pFwImage,
|
|
+ IN const u8 *pFwImage,
|
|
IN ULONG FwLen);
|
|
|
|
NTSTATUS RTUSBFirmwareOpmode(
|
|
diff --git a/drivers/staging/rt2870/common/rtusb_io.c b/drivers/staging/rt2870/common/rtusb_io.c
|
|
index 1d69590..1f776c4 100644
|
|
--- a/drivers/staging/rt2870/common/rtusb_io.c
|
|
+++ b/drivers/staging/rt2870/common/rtusb_io.c
|
|
@@ -92,7 +92,7 @@ NTSTATUS RTUSBFirmwareRun(
|
|
*/
|
|
NTSTATUS RTUSBFirmwareWrite(
|
|
IN PRTMP_ADAPTER pAd,
|
|
- IN PUCHAR pFwImage,
|
|
+ IN const u8 *pFwImage,
|
|
IN ULONG FwLen)
|
|
{
|
|
UINT32 MacReg;
|
|
@@ -224,7 +224,7 @@ NTSTATUS RTUSBMultiRead(
|
|
NTSTATUS RTUSBMultiWrite_OneByte(
|
|
IN PRTMP_ADAPTER pAd,
|
|
IN USHORT Offset,
|
|
- IN PUCHAR pData)
|
|
+ IN const u8 *pData)
|
|
{
|
|
NTSTATUS Status;
|
|
|
|
@@ -236,7 +236,7 @@ NTSTATUS RTUSBMultiWrite_OneByte(
|
|
0x6,
|
|
0,
|
|
Offset,
|
|
- pData,
|
|
+ (u8 *)pData,
|
|
1);
|
|
|
|
return Status;
|
|
@@ -245,14 +245,14 @@ NTSTATUS RTUSBMultiWrite_OneByte(
|
|
NTSTATUS RTUSBMultiWrite(
|
|
IN PRTMP_ADAPTER pAd,
|
|
IN USHORT Offset,
|
|
- IN PUCHAR pData,
|
|
+ IN const u8 *pData,
|
|
IN USHORT length)
|
|
{
|
|
NTSTATUS Status;
|
|
|
|
|
|
USHORT index = 0,Value;
|
|
- PUCHAR pSrc = pData;
|
|
+ const u8 *pSrc = pData;
|
|
USHORT resude = 0;
|
|
|
|
resude = length % 2;
|
|
--
|
|
1.6.6
|
|
|