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

use pd_error() instead of error()

Browse source
This commit is contained in:
IOhannes m zmölnig 2022-03-21 09:03:24 +01:00
parent 0fe7f81a66
commit ebd8348497
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
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(long *baud); static long get_baud_ratebits(t_comport*x, 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,19 +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_comport *x, long *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]: %ld not valid, using closest value: %ld", *baud, baudratetable[i]); pd_error(x, "[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 %ld is not supported or out of range, using 9600\n",*baud); pd_error(x, "*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];
@ -707,7 +707,7 @@ 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; long baud = fbaud;
speed_t baudbits = get_baud_ratebits(&baud); speed_t baudbits = get_baud_ratebits(x, &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);
if( cfsetispeed(tio, baudbits) != 0 ) if( cfsetispeed(tio, baudbits) != 0 )