From: bernie Date: Tue, 10 Aug 2004 06:29:50 +0000 (+0000) Subject: Rename timer_gettick() to timer_ticks(). X-Git-Tag: 1.0.0~1119 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=49169e7ad903e2054583d8ec80dc75b59bcb46a8;hp=087d99a956f41f5e1c62116a0e88a4f6c8c0f718;p=bertos.git Rename timer_gettick() to timer_ticks(). git-svn-id: https://src.develer.com/svnoss/bertos/trunk@122 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/drv/ser.c b/drv/ser.c index ac91d87f..ca2b3592 100755 --- a/drv/ser.c +++ b/drv/ser.c @@ -28,6 +28,9 @@ /* * $Log$ + * Revision 1.10 2004/08/10 06:29:50 bernie + * Rename timer_gettick() to timer_ticks(). + * * Revision 1.9 2004/08/08 06:06:20 bernie * Use new-style CONFIG_ idiom; Fix module-wide documentation. * @@ -90,7 +93,7 @@ int ser_putchar(int c, struct Serial *port) if (fifo_isfull_locked(&port->txfifo)) { #if CONFIG_SER_TXTIMEOUT != -1 - time_t start_time = timer_gettick(); + time_t start_time = timer_ticks(); #endif /* Attende finche' il buffer e' pieno... */ @@ -101,7 +104,7 @@ int ser_putchar(int c, struct Serial *port) proc_switch(); #endif #if CONFIG_SER_TXTIMEOUT != -1 - if (timer_gettick() - start_time >= port->txtimeout) + if (timer_ticks() - start_time >= port->txtimeout) { port->status |= SERRF_TXTIMEOUT; return EOF; @@ -137,7 +140,7 @@ int ser_getchar(struct Serial *port) if (fifo_isempty_locked(&port->rxfifo)) { #if CONFIG_SER_RXTIMEOUT != -1 - time_t start_time = timer_gettick(); + time_t start_time = timer_ticks(); #endif /* Wait while buffer is empty */ do @@ -147,7 +150,7 @@ int ser_getchar(struct Serial *port) proc_switch(); #endif #if CONFIG_SER_RXTIMEOUT != -1 - if (timer_gettick() - start_time >= port->rxtimeout) + if (timer_ticks() - start_time >= port->rxtimeout) { port->status |= SERRF_RXTIMEOUT; return EOF;