doohoyi/comport
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

getting rid of some warnings

Browse source 
svn path=/trunk/externals/iem/comport/; revision=17565
This commit is contained in:
IOhannes m zmölnig 2015-09-16 09:04:38 +00:00
parent 2766f264eb
commit 052c5e675f
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
comport/comport.c
View file

@ -256,7 +256,7 @@ static HANDLE close_serial(t_comport *x);
static int set_hupcl(t_comport *x, int nr); static int set_hupcl(t_comport *x, int nr);
static int open_serial(unsigned int com_num, t_comport *x); static int open_serial(unsigned int com_num, t_comport *x);
static int close_serial(t_comport *x); static int close_serial(t_comport *x);
static long get_baud_ratebits(t_float *baud); static long get_baud_ratebits(long *baud);
#endif #endif
static void comport_pollintervall(t_comport *x, t_floatarg g); static void comport_pollintervall(t_comport *x, t_floatarg g);
static void comport_tick(t_comport *x); static void comport_tick(t_comport *x);
@ -683,20 +683,19 @@ int comport_get_cts(t_comport *x)
#else /* NT */ #else /* NT */
/* ----------------- POSIX - UNIX ------------------------------ */ /* ----------------- POSIX - UNIX ------------------------------ */
static long get_baud_ratebits(long *baud)
static long get_baud_ratebits(t_float *baud)
{ {
int i = 0; int i = 0;
while(i < BAUDRATETABLE_LEN && baudratetable[i] > *baud) i++; while(i < BAUDRATETABLE_LEN && baudratetable[i] > *baud) i++;
if(baudratetable[i] != *baud) if(baudratetable[i] != *baud)
error("[comport]: %d not valid, using closest value: ", *baud, baudratetable[i]); error("[comport]: %ld not valid, using closest value: %ld", *baud, baudratetable[i]);
/* nearest Baudrate finding */ /* nearest Baudrate finding */
if(i==BAUDRATETABLE_LEN || baudspeedbittable[i] < 0) if(i==BAUDRATETABLE_LEN || baudspeedbittable[i] < 0)
{ {
error("*Warning* The baud rate %d is not supported or out of range, using 9600\n",*baud); error("*Warning* The baud rate %ld is not supported or out of range, using 9600\n",*baud);
i = 8; i = 8;
} }
*baud = baudratetable[i]; *baud = baudratetable[i];
@ -704,9 +703,10 @@ static long get_baud_ratebits(t_float *baud)
return baudspeedbittable[i]; return baudspeedbittable[i];
} }
static float set_baudrate(t_comport *x, t_float baud) static float set_baudrate(t_comport *x, t_float fbaud)
{ {
struct termios *tio = &(x->com_termio); struct termios *tio = &(x->com_termio);
long baud = fbaud;
speed_t baudbits = get_baud_ratebits(&baud); speed_t baudbits = get_baud_ratebits(&baud);
comport_verbose("[comport] set_baudrate: Setting baud rate to %g with baudbits 0x%X", baud, baudbits); comport_verbose("[comport] set_baudrate: Setting baud rate to %g with baudbits 0x%X", baud, baudbits);
@ -918,8 +918,8 @@ static int open_serial(unsigned int com_num, t_comport *x)
x->serial_device = gensym(glob_buffer.gl_pathv[com_num]); x->serial_device = gensym(glob_buffer.gl_pathv[com_num]);
else else
{ {
pd_error(x, "[comport] ** WARNING ** port #%d does not exist! (max == %d)", pd_error(x, "[comport] ** WARNING ** port #%d does not exist! (max == %lu)",
com_num,glob_buffer.gl_pathc - 1); com_num,(unsigned long)(glob_buffer.gl_pathc - 1));
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
globfree( &(glob_buffer) ); globfree( &(glob_buffer) );
@ -1256,7 +1256,6 @@ static void comport_list(t_comport *x, t_symbol *s, int argc, t_atom *argv)
{ {
unsigned char temp_array[COMPORT_BUF_SIZE];/* arbitrary maximum list length */ unsigned char temp_array[COMPORT_BUF_SIZE];/* arbitrary maximum list length */
int i, count; int i, count;
int result;
count = argc; count = argc;
if (argc > COMPORT_BUF_SIZE) if (argc > COMPORT_BUF_SIZE)
@ -1266,7 +1265,7 @@ static void comport_list(t_comport *x, t_symbol *s, int argc, t_atom *argv)
} }
for(i = 0; i < count; i++) for(i = 0; i < count; i++)
temp_array[i] = ((unsigned char)atom_getint(argv+i))&0xFF; /* brutal conv */ temp_array[i] = ((unsigned char)atom_getint(argv+i))&0xFF; /* brutal conv */
result = write_serials(x, temp_array, count); write_serials(x, temp_array, count);
} }
static void *comport_new(t_symbol *s, int argc, t_atom *argv) static void *comport_new(t_symbol *s, int argc, t_atom *argv)