redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: xgifb: clean up register access types 

Make type usage consistent. Use u8 for HW registers and unsigned for
bitmasks.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
hifive-unleashed-5.1
Aaro Koskinen 2011-03-13 12:26:27 +02:00 committed by Greg Kroah-Hartman
parent dc50556bbb
commit d0e23bdf3a
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/xgifb/vb_util.c
View File

@ -8,46 +8,43 @@
#include "vb_util.h" #include "vb_util.h"
void xgifb_reg_set(unsigned long port, unsigned short index, void xgifb_reg_set(unsigned long port, u8 index, u8 data)
unsigned short data)
{ {
outb(index, port); outb(index, port);
outb(data, port + 1); outb(data, port + 1);
} }
unsigned char xgifb_reg_get(unsigned long port, unsigned short index) u8 xgifb_reg_get(unsigned long port, u8 index)
{ {
unsigned char data; u8 data;
outb(index, port); outb(index, port);
data = inb(port + 1); data = inb(port + 1);
return data; return data;
} }
void xgifb_reg_and_or(unsigned long Port, unsigned short Index, void xgifb_reg_and_or(unsigned long Port, u8 Index,
unsigned short DataAND, unsigned short DataOR) unsigned DataAND, unsigned DataOR)
{ {
unsigned short temp; u8 temp;
temp = xgifb_reg_get(Port, Index); /* XGINew_Part1Port index 02 */ temp = xgifb_reg_get(Port, Index); /* XGINew_Part1Port index 02 */
temp = (temp & (DataAND)) | DataOR; temp = (temp & (DataAND)) | DataOR;
xgifb_reg_set(Port, Index, temp); xgifb_reg_set(Port, Index, temp);
} }
void xgifb_reg_and(unsigned long Port, unsigned short Index, void xgifb_reg_and(unsigned long Port, u8 Index, unsigned DataAND)
unsigned short DataAND)
{ {
unsigned short temp; u8 temp;
temp = xgifb_reg_get(Port, Index); /* XGINew_Part1Port index 02 */ temp = xgifb_reg_get(Port, Index); /* XGINew_Part1Port index 02 */
temp &= DataAND; temp &= DataAND;
xgifb_reg_set(Port, Index, temp); xgifb_reg_set(Port, Index, temp);
} }
void xgifb_reg_or(unsigned long Port, unsigned short Index, void xgifb_reg_or(unsigned long Port, u8 Index, unsigned DataOR)
unsigned short DataOR)
{ {
unsigned short temp; u8 temp;
temp = xgifb_reg_get(Port, Index); /* XGINew_Part1Port index 02 */ temp = xgifb_reg_get(Port, Index); /* XGINew_Part1Port index 02 */
temp |= DataOR; temp |= DataOR;

10
drivers/staging/xgifb/vb_util.h
View File

@ -1,9 +1,9 @@
#ifndef _VBUTIL_ #ifndef _VBUTIL_
#define _VBUTIL_ #define _VBUTIL_
extern void xgifb_reg_set(unsigned long, unsigned short, unsigned short); extern void xgifb_reg_set(unsigned long, u8, u8);
extern unsigned char xgifb_reg_get(unsigned long, unsigned short); extern u8 xgifb_reg_get(unsigned long, u8);
extern void xgifb_reg_or(unsigned long, unsigned short, unsigned short); extern void xgifb_reg_or(unsigned long, u8, unsigned);
extern void xgifb_reg_and(unsigned long, unsigned short, unsigned short); extern void xgifb_reg_and(unsigned long, u8, unsigned);
extern void xgifb_reg_and_or(unsigned long, unsigned short, unsigned short, unsigned short); extern void xgifb_reg_and_or(unsigned long, u8, unsigned, unsigned);
#endif #endif