d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use standard types in preference to BSD types so that these header files

Browse Source 
can be used in applications compiled with only POSIX types visible.

MFC after: 2 weeks
This commit is contained in:
gibbs 2010-03-28 00:10:09 +00:00
parent 08131b2b82
commit 5271b37f10
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/bktr/ioctl_bt848.h
View File

@ -89,9 +89,9 @@
* EEProm stuff
*/
struct eeProm {
short offset;
short count;
u_char bytes[ 256 ];
short offset;
short count;
unsigned char bytes[ 256 ];
};
@ -147,7 +147,7 @@ struct eeProm {
* b23-b16: i2c addr (write)
* b31-b24: 1 = write, 0 = read
*/
#define BT848_I2CWR _IOWR('x', 57, u_long) /* i2c read-write */
#define BT848_I2CWR _IOWR('x', 57, unsigned long) /* i2c read-write */
struct bktr_msp_control {
unsigned char function;
@ -192,10 +192,10 @@ typedef enum { METEOR_PIXTYPE_RGB, METEOR_PIXTYPE_YUV,
struct meteor_pixfmt {
u_int index; /* Index in supported pixfmt list */
unsigned int index; /* Index in supported pixfmt list */
METEOR_PIXTYPE type; /* What's the board gonna feed us */
u_int Bpp; /* Bytes per pixel */
u_long masks[3]; /* R,G,B or Y,U,V masks, respectively */
unsigned int Bpp; /* Bytes per pixel */
unsigned long masks[3]; /* R,G,B or Y,U,V masks, respectively */
unsigned swap_bytes :1; /* Bytes swapped within shorts */
unsigned swap_shorts:1; /* Shorts swapped within longs */
};

26
sys/dev/bktr/ioctl_meteor.h
View File

@ -50,27 +50,27 @@ struct meteor_capframe {
/* structure for METEOR[GS]ETGEO - get/set geometry */
struct meteor_geomet {
u_short rows;
u_short columns;
u_short frames;
u_long oformat;
unsigned short rows;
unsigned short columns;
unsigned short frames;
unsigned long oformat;
} ;
/* structure for METEORGCOUNT-get count of frames, fifo errors and dma errors */
struct meteor_counts {
u_long fifo_errors; /* count of fifo errors since open */
u_long dma_errors; /* count of dma errors since open */
u_long frames_captured; /* count of frames captured since open */
u_long even_fields_captured; /* count of even fields captured */
u_long odd_fields_captured; /* count of odd fields captured */
unsigned long fifo_errors; /* count of fifo errors since open */
unsigned long dma_errors; /* count of dma errors since open */
unsigned long frames_captured; /* count of frames captured since open */
unsigned long even_fields_captured; /* count of even fields captured */
unsigned long odd_fields_captured; /* count of odd fields captured */
} ;
/* structure for getting and setting direct transfers to vram */
struct meteor_video {
u_long addr; /* Address of location to dma to */
u_long width; /* Width of memory area */
u_long banksize; /* Size of Vram bank */
u_long ramsize; /* Size of Vram */
unsigned long addr; /* Address of location to dma to */
unsigned long width; /* Width of memory area */
unsigned long banksize; /* Size of Vram bank */
unsigned long ramsize; /* Size of Vram */
};
#define METEORCAPTUR _IOW('x', 1, int) /* capture a frame */