Commit fe5d00eb authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: channel/control/firmware/int/usbpipe to new structures 



This patch cleans up function declarations, definitions and local variables
where appropriate replacing types defined in "ttype.h" with linux/types.h.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da033bfd

drivers/staging/vt6656/channel.c

+3 −4
Original line number Diff line number Diff line
@@ -436,11 +436,10 @@ CHvChannelGetList ( 
}





void CHvInitChannelTable(void *pDeviceHandler)

void CHvInitChannelTable(struct vnt_private *pDevice)

{

    PSDevice    pDevice = (PSDevice) pDeviceHandler;

    BOOL        bMultiBand = FALSE;

    unsigned int ii;

	int bMultiBand = FALSE;

	int ii;



    for (ii = 1; ii <= CB_MAX_CHANNEL; ii++)

	sChannelTbl[ii].bValid = FALSE;

drivers/staging/vt6656/channel.h

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#ifndef _CHANNEL_H_

#define _CHANNEL_H_



#include "device.h"

#include "ttype.h"



/*---------------------  Export Definitions -------------------------*/
@@ -47,7 +48,7 @@ typedef struct tagSChannelTblElement { 
/*---------------------  Export Functions  --------------------------*/



BOOL    ChannelValid(unsigned int CountryCode, unsigned int ChannelNum);

void    CHvInitChannelTable(void *pDeviceHandler);

void    CHvInitChannelTable(struct vnt_private *pDevice);

BYTE    CHbyGetChannelMapping(BYTE byChannelNumber);



BOOL CHvChannelGetList(unsigned int uCountryCodeIdx, PBYTE pbyChannelTable);

drivers/staging/vt6656/control.c

+23 −32
Original line number Diff line number Diff line
@@ -56,43 +56,34 @@ 


/*---------------------  Export Functions  --------------------------*/



void ControlvWriteByte(PSDevice pDevice, BYTE byRegType, BYTE byRegOfs,

			BYTE byData)

void ControlvWriteByte(struct vnt_private *pDevice, u8 reg, u8 reg_off,

			u8 data)

{

	BYTE	byData1;

	byData1 = byData;

	CONTROLnsRequestOut(pDevice,

		MESSAGE_TYPE_WRITE,

		byRegOfs,

		byRegType,

		1,

		&byData1);



	CONTROLnsRequestOut(pDevice, MESSAGE_TYPE_WRITE, reg_off, reg,

		sizeof(u8), &data);



	return;

}



void ControlvReadByte(PSDevice pDevice, BYTE byRegType, BYTE byRegOfs,

			PBYTE pbyData)

void ControlvReadByte(struct vnt_private *pDevice, u8 reg, u8 reg_off,

			u8 *data)

{

	int ntStatus;

	BYTE	byData1;

	ntStatus = CONTROLnsRequestIn(pDevice,

					MESSAGE_TYPE_READ,

					byRegOfs,

					byRegType,

					1,

					&byData1);

	*pbyData = byData1;

	CONTROLnsRequestIn(pDevice, MESSAGE_TYPE_READ,

			reg_off, reg, sizeof(u8), data);

	return;

}



void ControlvMaskByte(PSDevice pDevice, BYTE byRegType, BYTE byRegOfs,

			BYTE byMask, BYTE byData)

void ControlvMaskByte(struct vnt_private *pDevice, u8 reg_type, u8 reg_off,

			u8 reg_mask, u8 data)

{

	BYTE	pbyData[2];

	pbyData[0] = byData;

	pbyData[1] = byMask;

	CONTROLnsRequestOut(pDevice,

				MESSAGE_TYPE_WRITE_MASK,

				byRegOfs,

				byRegType,

				2,

				pbyData);

	u8 reg_data[2];



	reg_data[0] = data;

	reg_data[1] = reg_mask;



	CONTROLnsRequestOut(pDevice, MESSAGE_TYPE_WRITE_MASK, reg_off,

			reg_type, ARRAY_SIZE(reg_data), reg_data);



	return;

}

drivers/staging/vt6656/control.h

+6 −20
Original line number Diff line number Diff line
@@ -51,28 +51,14 @@ 


/*---------------------  Export Functions  --------------------------*/



void ControlvWriteByte(

     PSDevice pDevice,

     BYTE byRegType,

     BYTE byRegOfs,

     BYTE byData

    );

void ControlvWriteByte(struct vnt_private *pDevice, u8 reg, u8 reg_off,

			u8 data);



void ControlvReadByte(struct vnt_private *pDevice, u8 reg, u8 reg_off,

			u8 *data);



void ControlvReadByte(

     PSDevice pDevice,

     BYTE byRegType,

     BYTE byRegOfs,

     PBYTE pbyData

    );

void ControlvMaskByte(struct vnt_private *pDevice, u8 reg_type, u8 reg_off,

			u8 reg_mask, u8 data);





void ControlvMaskByte(

     PSDevice pDevice,

     BYTE byRegType,

     BYTE byRegOfs,

     BYTE byMask,

     BYTE byData

    );



#endif /* __CONTROL_H__ */

drivers/staging/vt6656/firmware.c

+4 −13
Original line number Diff line number Diff line
@@ -56,10 +56,7 @@ static int msglevel =MSG_LEVEL_INFO; 
/*---------------------  Export Functions  --------------------------*/





BOOL

FIRMWAREbDownload(

     PSDevice pDevice

    )

int FIRMWAREbDownload(struct vnt_private *pDevice)

{

	struct device *dev = &pDevice->usb->dev;

	const struct firmware *fw;
@@ -114,10 +111,7 @@ FIRMWAREbDownload( 
}

MODULE_FIRMWARE(FIRMWARE_NAME);



BOOL

FIRMWAREbBrach2Sram(

     PSDevice pDevice

    )

int FIRMWAREbBrach2Sram(struct vnt_private *pDevice)

{

	int NdisStatus;
@@ -139,10 +133,7 @@ FIRMWAREbBrach2Sram( 
}





BOOL

FIRMWAREbCheckVersion(

     PSDevice pDevice

    )

int FIRMWAREbCheckVersion(struct vnt_private *pDevice)

{

	int ntStatus;