PIN input DIAL support change

This commit is contained in:
NIIBE Yutaka 2011-11-01 15:01:32 +09:00
parent ed7e904aef
commit 6337371016
2 changed files with 7 additions and 5 deletions

View File

@ -1,5 +1,8 @@
2011-11-01 Niibe Yutaka <gniibe@fsij.org>
* src/pin-dial.c (pinpad_getline): New.
(pin_main): Remove.
* boards/STBEE_MINI/board.h (TIMx): Define.
boards/STBEE/board.h (TIMx): Ditto.
boards/STM8S_DISCOVERY/board.h: Ditto.

View File

@ -128,10 +128,9 @@ dial_sw_interrupt (void)
}
msg_t
pin_main (void *arg)
int
pinpad_getline (int msg_code, systime_t timeout)
{
int msg_code = (int)arg;
uint16_t count, count_prev;
uint8_t input_mode;
uint8_t sw_push_count;
@ -150,7 +149,7 @@ pin_main (void *arg)
sw_push_count = 0;
sw_event = 0;
while (!chThdShouldTerminate ())
while (1)
{
eventmask_t m;
@ -218,5 +217,5 @@ pin_main (void *arg)
led_disp (OFF);
TIM4->CR1 &= ~TIM_CR1_CEN;
dial_sw_disable ();
return 0;
return pin_input_len;
}