Commit 8c6356e2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: dt3155: coding style cleanups for the .h files 



This cleans up some of the coding style issues in the .h files.

More remains to be done.

Cc: Scott Smedley <ss@aao.gov.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1769fd86

drivers/staging/dt3155/dt3155.h

+72 −76
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ along with the DT3155 Device Driver; if not, write to the Free 
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,

MA 02111-1307 USA



  $Id: dt3155.h,v 1.11 2005/08/09 06:08:51 ssmedley Exp $



-- Changes --



  Date     Programmer  Description of changes made
@@ -57,7 +55,7 @@ MA 02111-1307 USA 
#define MAXBOARDS 1



#define BOARD_MAX_BUFFS	3

#define MAXBUFFERS BOARD_MAX_BUFFS*MAXBOARDS

#define MAXBUFFERS	(BOARD_MAX_BUFFS*MAXBOARDS)



#define PCI_PAGE_SIZE	(1 << 12)
@@ -80,15 +78,16 @@ struct dt3155_config_s { 




/* hold data for each frame */

typedef struct

{

typedef struct {

	u_long addr;		/* address of the buffer with the frame */

	u_long tag;		/* unique number for the frame */

	struct timeval time;	/* time that capture took place */

} frame_info_t;



/* Structure for interrupt and buffer handling.  */

/* This is the setup for 1 card                  */

/*

 * Structure for interrupt and buffer handling.

 * This is the setup for 1 card

 */

struct dt3155_fbuffer_s {

	int    nbuffers;
@@ -110,7 +109,6 @@ struct dt3155_fbuffer_s { 


	int stop_acquire;	/* Flag to stop interrupts */

	u_long frame_count;	/* Counter for frames acquired by this card */



};
@@ -122,8 +120,7 @@ struct dt3155_fbuffer_s { 
#define DT3155_ACQ		2



/* There is one status structure for each card. */

typedef struct dt3155_status_s

{

typedef struct dt3155_status_s {

	int fixed_mode;		/* if 1, we are in fixed frame mode */

	u_long reg_addr;	/* Register address for a single card */

	u_long mem_addr;	/* Buffer start addr for this card */
@@ -156,15 +153,14 @@ extern struct dt3155_status_s dt3155_status[MAXBOARDS]; 


/* Error codes */



#define DT_ERR_NO_BUFFERS   0x10000 /* not used but it might be one day - SS */

#define DT_ERR_NO_BUFFERS	0x10000	/* not used but it might be one day */

#define DT_ERR_CORRUPT		0x20000

#define DT_ERR_OVERRUN		0x30000

#define DT_ERR_I2C_TIMEOUT	0x40000

#define DT_ERR_MASK         0xff0000/* not used but it might be one day - SS */

#define DT_ERR_MASK		0xff0000/* not used but it might be one day */



/* User code will probably want to declare one of these for each card */

typedef struct dt3155_read_s

{

typedef struct dt3155_read_s {

	u_long offset;

	u_long frame_seq;

	u_long state;

drivers/staging/dt3155/dt3155_io.h

+35 −38
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ MA 02111-1307 USA 


/* macros to access registers */



#define   WriteMReg(Address, Data)        * ((u_long *) (Address)) = Data

#define   ReadMReg(Address, Data)         Data = * ((u_long *) (Address))

#define WriteMReg(Address, Data)	(*((u_long *)(Address)) = Data)

#define ReadMReg(Address, Data)		(Data = *((u_long *)(Address)))



/***************** 32 bit register globals  **************/
@@ -241,8 +241,7 @@ typedef union iic_csr2_tag { 
 */

typedef union dma_upper_lmt_tag   {

	u_long reg;

  struct

  {

	struct {

		u_long DMA_UPPER_LMT_VAL:24;

		u_long :8;

	} fld;
@@ -302,8 +301,7 @@ extern DMA_UPPER_LMT_R odd_dma_upper_lmt_r; 


typedef union i2c_csr2_tag {

	u_char reg;

  struct

  {

	struct {

		u_char CHROM_FIL:1;

		u_char SYNC_SNTL:1;

		u_char HZ50:1;
@@ -316,8 +314,7 @@ typedef union i2c_csr2_tag { 


typedef union i2c_even_csr_tag {

	u_char    reg;

  struct

  {

	struct {

		u_char DONE_EVE:1;

		u_char SNGL_EVE:1;

		u_char ERROR_EVE:1;

drivers/staging/dt3155/dt3155_drv.h

+3 −3

File changed.

Contains only whitespace changes.

drivers/staging/dt3155/dt3155_isr.h

+10 −10

File changed.

Contains only whitespace changes.