diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2016-05-17 17:51:41 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2016-05-17 17:51:41 +0900 |
| commit | dce6c70ffc2fdee9dd37fe68413babf618bb12b0 (patch) | |
| tree | abf78e743f16e278c8b325b9f2959e276f2552b9 /example-cdc/sample.c | |
| parent | 3651aa64b48d46fa8572a94b23c291d81e9d84ea (diff) | |
more fix for chopstx_poll
Diffstat (limited to 'example-cdc/sample.c')
| -rw-r--r-- | example-cdc/sample.c | 128 |
1 files changed, 22 insertions, 106 deletions
diff --git a/example-cdc/sample.c b/example-cdc/sample.c index 9b9a4a6..699c854 100644 --- a/example-cdc/sample.c +++ b/example-cdc/sample.c @@ -5,7 +5,7 @@ #include "sys.h" /* for set_led */ #include "usb_lld.h" -#include "stream.h" +#include "tty.h" static chopstx_mutex_t mtx; static chopstx_cond_t cnd0; @@ -54,61 +54,12 @@ blk (void *arg) return NULL; } -#define INTR_REQ_USB 20 - -static void * -usb_intr (void *arg) -{ - extern void usb_lld_init (uint8_t feature); - extern void usb_interrupt_handler (void); - - chopstx_intr_t interrupt; - - (void)arg; -#if defined(OLDER_SYS_H) - /* - * Historically (before sys < 3.0), NVIC priority setting for USB - * interrupt was done in usb_lld_sys_init. Thus this code. - * - * When USB interrupt occurs between usb_lld_init (which assumes - * ISR) and chopstx_claim_irq (which clears pending interrupt), - * invocation of usb_interrupt_handler won't occur. - * - * Calling usb_interrupt_handler is no harm even if there were no - * interrupts, thus, we call it unconditionally here, just in case - * if there is a request. - * - * We can't call usb_lld_init after chopstx_claim_irq, as - * usb_lld_init does its own setting for NVIC. Calling - * chopstx_claim_irq after usb_lld_init overrides that. - * - */ - usb_lld_init (0x80); /* Bus powered. */ - chopstx_claim_irq (&interrupt, INTR_REQ_USB); - usb_interrupt_handler (); -#else - chopstx_claim_irq (&interrupt, INTR_REQ_USB); - usb_lld_init (0x80); /* Bus powered. */ -#endif - - while (1) - { - chopstx_intr_wait (&interrupt); - - /* Process interrupt. */ - usb_interrupt_handler (); - } - - return NULL; -} #define PRIO_PWM 3 #define PRIO_BLK 2 -#define PRIO_INTR 4 extern uint8_t __process1_stack_base__, __process1_stack_size__; extern uint8_t __process2_stack_base__, __process2_stack_size__; -extern uint8_t __process3_stack_base__, __process3_stack_size__; const uint32_t __stackaddr_pwm = (uint32_t)&__process1_stack_base__; const size_t __stacksize_pwm = (size_t)&__process1_stack_size__; @@ -116,9 +67,6 @@ const size_t __stacksize_pwm = (size_t)&__process1_stack_size__; const uint32_t __stackaddr_blk = (uint32_t)&__process2_stack_base__; const size_t __stacksize_blk = (size_t)&__process2_stack_size__; -const uint32_t __stackaddr_intr = (uint32_t)&__process3_stack_base__; -const size_t __stacksize_intr = (size_t)&__process3_stack_size__; - static char hexchar (uint8_t x) { @@ -132,24 +80,11 @@ static char hexchar (uint8_t x) } -static int -check_recv (void *arg) -{ - struct stream *s = arg; - if ((s->flags & FLAG_CONNECTED) == 0) - return 1; - if ((s->flags & FLAG_RECV_AVAIL)) - return 1; - return 0; -} - - int main (int argc, const char *argv[]) { - struct stream *st; + struct tty *tty; uint8_t count; - extern uint32_t bDeviceState; (void)argc; (void)argv; @@ -158,14 +93,10 @@ main (int argc, const char *argv[]) chopstx_cond_init (&cnd0); chopstx_cond_init (&cnd1); - st = stream_open (); - m = 10; chopstx_create (PRIO_PWM, __stackaddr_pwm, __stacksize_pwm, pwm, NULL); chopstx_create (PRIO_BLK, __stackaddr_blk, __stacksize_blk, blk, NULL); - chopstx_create (PRIO_INTR, __stackaddr_intr, __stacksize_intr, - usb_intr, NULL); chopstx_usec_wait (200*1000); @@ -175,67 +106,52 @@ main (int argc, const char *argv[]) chopstx_mutex_unlock (&mtx); u = 1; - while (bDeviceState != CONFIGURED) - chopstx_usec_wait (500*1000); + + tty = tty_open (); + tty_wait_configured (tty); count = 0; + m = 50; while (1) { - uint8_t s[64]; + uint8_t s[128]; u = 1; - if (stream_wait_connection (st) < 0) - { - chopstx_usec_wait (1000*1000); - continue; - } + tty_wait_connection (tty); chopstx_usec_wait (500*1000); /* Send ZLP at the beginning. */ - stream_send (st, s, 0); + tty_send (tty, s, 0); memcpy (s, "xx: Hello, World with Chopstx!\r\n", 32); s[0] = hexchar (count >> 4); s[1] = hexchar (count & 0x0f); count++; - if (stream_send (st, s, 32) < 0) + if (tty_send (tty, s, 32) < 0) continue; while (1) { int size; uint32_t usec; - struct chx_poll_cond poll_desc; - - poll_desc.type = CHOPSTX_POLL_COND; - poll_desc.ready = 0; - poll_desc.cond = &st->cnd; - poll_desc.mutex = &st->mtx; - poll_desc.check = check_recv; - poll_desc.arg = st; - /* With chopstx_poll, we can do timed cond_wait */ usec = 3000000; /* 3.0 seconds */ - if (chopstx_poll (&usec, 1, &poll_desc)) - { - size = stream_recv (st, s + 4); + size = tty_recv (tty, s + 4, &usec); + if (size < 0) + break; - if (size < 0) + if (usec) + { + s[0] = hexchar (size >> 4); + s[1] = hexchar (size & 0x0f); + s[2] = ':'; + s[3] = ' '; + s[size + 4] = '\r'; + s[size + 5] = '\n'; + if (tty_send (tty, s, size + 6) < 0) break; - - if (size >= 0) - { - s[0] = hexchar (size >> 4); - s[1] = hexchar (size & 0x0f); - s[2] = ':'; - s[3] = ' '; - s[size + 4] = '\r'; - s[size + 5] = '\n'; - if (stream_send (st, s, size + 6) < 0) - break; - } } u ^= 1; |