frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compiler warnings in hw/xfree86/i2c/fi1236.c

This commit is contained in:
Greg Kroah-Hartman 2006-06-19 14:36:54 -07:00
parent 29c78321e8
commit d97a21acb8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/i2c/fi1236.c
View File

@ -99,6 +99,7 @@ xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "MT2032: Company code 0x%02x%02x, pa
} }
/* might be buggy */ /* might be buggy */
#if 0
static void MT2032_shutdown(FI1236Ptr f) static void MT2032_shutdown(FI1236Ptr f)
{ {
CARD8 data[10]; CARD8 data[10];
@ -124,6 +125,7 @@ I2C_WriteRead(&(f->d), (I2CByte *)data, 4, NULL, 0);
usleep(15000); usleep(15000);
} }
#endif
static void MT2032_dump_status(FI1236Ptr f); static void MT2032_dump_status(FI1236Ptr f);
@ -131,7 +133,7 @@ static void MT2032_init(FI1236Ptr f)
{ {
CARD8 data[10]; CARD8 data[10];
CARD8 value; CARD8 value;
CARD8 xogc; CARD8 xogc = 0x00;
MT2032_getid(f); MT2032_getid(f);
@ -479,7 +481,7 @@ if(type==TUNER_TYPE_MT2032){
} }
CARD32 AFC_TimerCallback(OsTimerPtr timer, CARD32 time, pointer data){ static CARD32 AFC_TimerCallback(OsTimerPtr timer, CARD32 time, pointer data){
FI1236Ptr f=(FI1236Ptr)data; FI1236Ptr f=(FI1236Ptr)data;
if(FI1236_AFC(f))return 150; if(FI1236_AFC(f))return 150;
else { else {
@ -517,7 +519,7 @@ void FI1236_tune(FI1236Ptr f, CARD32 frequency)
xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "Setting tuner band to %d\n", f->tuner_data.band); xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "Setting tuner band to %d\n", f->tuner_data.band);
xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "Setting tuner frequency to %d\n", frequency); xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "Setting tuner frequency to %d\n", (int)frequency);
if ((f->type == TUNER_TYPE_FM1216ME) || (f->type == TUNER_TYPE_FI1236W)) if ((f->type == TUNER_TYPE_FM1216ME) || (f->type == TUNER_TYPE_FI1236W))
{ {

1
hw/xfree86/i2c/fi1236.h
View File

@ -90,6 +90,7 @@ typedef struct {
FI1236Ptr Detect_FI1236(I2CBusPtr b, I2CSlaveAddr addr); FI1236Ptr Detect_FI1236(I2CBusPtr b, I2CSlaveAddr addr);
void FI1236_set_tuner_type(FI1236Ptr f, int type); void FI1236_set_tuner_type(FI1236Ptr f, int type);
void TUNER_set_frequency(FI1236Ptr f, CARD32 frequency); void TUNER_set_frequency(FI1236Ptr f, CARD32 frequency);
void FI1236_tune(FI1236Ptr f, CARD32 frequency);
int FI1236_AFC(FI1236Ptr f); int FI1236_AFC(FI1236Ptr f);
int TUNER_get_afc_hint(FI1236Ptr f); int TUNER_get_afc_hint(FI1236Ptr f);
void fi1236_dump_status(FI1236Ptr f); void fi1236_dump_status(FI1236Ptr f);