X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=nocturn.c;h=7dd788855af55e76b2c3141756786a5d0f348570;hb=9c4278f983c009f59195e0419718d5b75c70965e;hp=50d0557c9edff212fb797845822e66b052738647;hpb=a8719b51a34bd66742c2585041c0e0315ff25ebb;p=ursary.git diff --git a/nocturn.c b/nocturn.c index 50d0557..7dd7888 100644 --- a/nocturn.c +++ b/nocturn.c @@ -11,69 +11,19 @@ #include #include -#include -#include #include -#include +#include #include #include -#include -#include - -#include #include "ursaryd.h" +#include "usb.h" -static libusb_context *usb_ctx; -static libusb_device_handle *usb_dev; - -static struct main_file **usb_fds; - -static int usb_fd_ready(struct main_file *f UNUSED) -{ - DBG("USB: Handling events (ready on fd %d)", f->fd); - struct timeval tv = { 0, 0 }; - int comp = 0; - int err = libusb_handle_events_timeout_completed(usb_ctx, &tv, &comp); - if (err < 0) - msg(L_ERROR, "libusb_handle_events: error %d", err); - return HOOK_IDLE; -} - -static void usb_added_fd(int fd, short events, void *user_data UNUSED) -{ - if (fd >= (int) GARY_SIZE(usb_fds)) - GARY_RESIZE(usb_fds, fd + 1); - - struct main_file *f = usb_fds[fd]; - if (!f) - { - f = xmalloc_zero(sizeof(*f)); - usb_fds[fd] = f; - } - else if (file_is_active(f)) - { - DBG("USB: Releasing fd %d", fd); - file_del(f); - } - - DBG("USB: Adding fd %d with event mask %u", fd, events); - f->fd = fd; - f->read_handler = (events & POLLIN) ? usb_fd_ready : NULL; - f->write_handler = (events & POLLOUT) ? usb_fd_ready : NULL; - file_add(f); -} +static libusb_device_handle *noct_dev; +static bool noct_iface_claimed; -static void usb_removed_fd(int fd, void *user_data UNUSED) -{ - DBG("USB: Releasing fd %d", fd); - ASSERT(fd < (int) GARY_SIZE(usb_fds)); - struct main_file *f = usb_fds[fd]; - ASSERT(f); - ASSERT(file_is_active(f)); - file_del(f); -} +static void noct_error(int usb_err, char *text); static const char noct_magic[4][9] = { { 3, 0xb0, 0x00, 0x00 }, @@ -82,22 +32,25 @@ static const char noct_magic[4][9] = { { 2, 0x7f, 0x00 }, }; +static struct libusb_transfer *noct_read_xfer; +static bool noct_read_pending; +char noct_rotary_touched[10]; +char noct_button_pressed[16]; + static void noct_read_done(struct libusb_transfer *xfer) { byte *pkt = xfer->buffer; int len = xfer->actual_length; - DBG("USB: Read done: status %d, length %d", xfer->status, len); + DBG("Noct: Read done: status %d, length %d", xfer->status, len); + noct_read_pending = 0; if (xfer->status != LIBUSB_TRANSFER_COMPLETED) - { - msg(L_ERROR, "USB read failed with status %d, not submitting again", xfer->status); - return; - } + return noct_error(0, stk_printf("USB read failed with status %d", xfer->status)); #ifdef LOCAL_DEBUG char buf[256]; mem_to_hex(buf, pkt, len, ' '); - DBG("USB: Read <%s>", buf); + DBG("Noct: Read <%s>", buf); #endif int i = 0; @@ -135,6 +88,7 @@ static void noct_read_done(struct libusb_transfer *xfer) if (arg < 0x80) { DBG("Noct: Slider value = %d", arg); + notify_rotary(9, arg); continue; } break; @@ -155,6 +109,8 @@ static void noct_read_done(struct libusb_transfer *xfer) { int state = !!arg; DBG("Noct: Center touch = %d", state); + noct_rotary_touched[8] = state; + notify_touch(8, state); continue; } break; @@ -163,6 +119,8 @@ static void noct_read_done(struct libusb_transfer *xfer) { int state = !!arg; DBG("Noct: Slider touch = %d", state); + noct_rotary_touched[9] = state; + notify_touch(9, state); continue; } break; @@ -172,6 +130,8 @@ static void noct_read_done(struct libusb_transfer *xfer) int r = cmd - 0x60; int state = !!arg; DBG("Noct: Rotary %d touch = %d", r, state); + noct_rotary_touched[r] = state; + notify_touch(r, state); continue; } break; @@ -181,6 +141,7 @@ static void noct_read_done(struct libusb_transfer *xfer) int b = cmd - 0x70; int state = !!arg; DBG("Noct: Button %d = %d", b, state); + noct_button_pressed[b] = state; notify_button(b, state); continue; } @@ -191,44 +152,44 @@ static void noct_read_done(struct libusb_transfer *xfer) int err; if ((err = libusb_submit_transfer(xfer)) < 0) - die("Cannot submit transfer: error %d", err); + noct_error(err, "Cannot submit transfer"); + else + noct_read_pending = 1; } static void noct_read_init(void) { DBG("Noct: Read init"); - struct libusb_transfer *xfer = libusb_alloc_transfer(0); - libusb_fill_interrupt_transfer(xfer, usb_dev, 0x81, xmalloc(8), 8, noct_read_done, NULL, 0); + noct_read_xfer = libusb_alloc_transfer(0); + libusb_fill_interrupt_transfer(noct_read_xfer, noct_dev, 0x81, xmalloc(8), 8, noct_read_done, NULL, 0); int err; - if ((err = libusb_submit_transfer(xfer)) < 0) - die("Cannot submit transfer: error %d", err); + if ((err = libusb_submit_transfer(noct_read_xfer)) < 0) + noct_error(err, "Cannot submit transfer"); + else + noct_read_pending = 1; } -static byte noct_button_state[16]; +static byte noct_button_light[16]; static byte noct_ring_mode[8]; // RING_MODE_xxx static byte noct_ring_val[9]; -static uns noct_dirty_button; -static uns noct_dirty_ring_mode; -static uns noct_dirty_ring_val; +static uint noct_dirty_button; +static uint noct_dirty_ring_mode; +static uint noct_dirty_ring_val; static struct libusb_transfer *noct_write_xfer; -static uns noct_write_pending; +static bool noct_write_pending; static void noct_sched_write(void); static void noct_write_done(struct libusb_transfer *xfer) { int len = xfer->actual_length; - DBG("USB: Write done: status %d, length %d", xfer->status, len); + DBG("Noct: Write done: status %d, length %d", xfer->status, len); if (xfer->status != LIBUSB_TRANSFER_COMPLETED) - { - msg(L_ERROR, "USB write failed with status %d", xfer->status); - // FIXME: Handle the error in a meaningful way - return; - } + return noct_error(0, stk_printf("USB write failed with status %d", xfer->status)); if (len < xfer->length) msg(L_ERROR, "USB partial write: %d out of %d", len, xfer->length); @@ -236,9 +197,9 @@ static void noct_write_done(struct libusb_transfer *xfer) noct_sched_write(); } -static void noct_do_write(uns cmd, uns arg) +static void noct_do_write(uint cmd, uint arg) { - DBG("USB: Submitting write %02x %02x", cmd, arg); + DBG("Noct: Submitting write %02x %02x", cmd, arg); ASSERT(!noct_write_pending); noct_write_pending = 1; @@ -250,19 +211,19 @@ static void noct_do_write(uns cmd, uns arg) int err; if ((err = libusb_submit_transfer(xfer)) < 0) - die("Cannot submit transfer: error %d", err); + noct_error(err, "Cannot submit transfer"); } static void noct_sched_write(void) { - if (noct_write_pending) + if (!noct_dev || noct_write_pending) return; if (noct_dirty_button) { int i = bit_ffs(noct_dirty_button); noct_dirty_button ^= 1U << i; - noct_do_write(0x70 + i, noct_button_state[i]); + noct_do_write(0x70 + i, noct_button_light[i]); } else if (noct_dirty_ring_mode) { @@ -275,7 +236,7 @@ static void noct_sched_write(void) int i = bit_ffs(noct_dirty_ring_val); noct_dirty_ring_val ^= 1U << i; if (i == 8) - noct_do_write(0x50 + i, noct_ring_val[i]); + noct_do_write(0x50, noct_ring_val[i]); else noct_do_write(0x40 + i, noct_ring_val[i]); } @@ -305,27 +266,31 @@ void noct_set_button(int button, int val) { ASSERT(button >= 0 && button < 16); ASSERT(val == 0 || val == 1); - if (noct_button_state[button] != val) + if (noct_button_light[button] != val) { - noct_button_state[button] = val; + noct_button_light[button] = val; noct_dirty_button |= 1U << button; noct_sched_write(); } } +void noct_clear(void) +{ + for (int i=0; i<=8; i++) + noct_set_ring(i, RING_MODE_LEFT, 0); + for (int i=0; i<16; i++) + noct_set_button(i, 0); +} + static void noct_write_init(void) { DBG("Noct: Write init"); noct_write_xfer = libusb_alloc_transfer(0); - libusb_fill_interrupt_transfer(noct_write_xfer, usb_dev, 0x02, xmalloc(8), 0, noct_write_done, NULL, 1000); - -#if 0 // FIXME - noct_button_state[2] = 1; - noct_ring_mode[0] = 4; - noct_ring_val[0] = 0x40; -#endif + libusb_fill_interrupt_transfer(noct_write_xfer, noct_dev, 0x02, xmalloc(8), 0, noct_write_done, NULL, 1000); + bzero(noct_button_pressed, sizeof(noct_button_pressed)); + bzero(noct_rotary_touched, sizeof(noct_rotary_touched)); noct_dirty_button = 0xffff; noct_dirty_ring_mode = 0xff; noct_dirty_ring_val = 0x1ff; @@ -333,6 +298,7 @@ static void noct_write_init(void) } static struct main_timer noct_connect_timer; +static struct main_hook noct_error_hook; static void noct_connect(struct main_timer *t) { @@ -351,7 +317,7 @@ static void noct_connect(struct main_timer *t) desc.idVendor == 0x1235 && desc.idProduct == 0x000a) { - msg(L_DEBUG, "Found device: bus %d, addr %d", libusb_get_bus_number(dev), libusb_get_device_address(dev)); + msg(L_INFO, "Nocturn found at bus %d, addr %d", libusb_get_bus_number(dev), libusb_get_device_address(dev)); if (found_dev) { msg(L_ERROR, "Multiple Nocturn devices found. Using the first one."); @@ -369,67 +335,109 @@ static void noct_connect(struct main_timer *t) return; } - msg(L_DEBUG, "Initializing Nocturn"); + DBG("Initializing Nocturn"); - if ((err = libusb_open(found_dev, &usb_dev)) < 0) - die("libusb_open failed: error %d", err); + if ((err = libusb_open(found_dev, &noct_dev)) < 0) + return noct_error(err, "libusb_open failed"); + + // In newer kernels, Nocturn is claimed by snd-usb-audio. Tell it to surrender the device. + libusb_detach_kernel_driver(noct_dev, 0); // There exist configurations 1 (high brightness) and 2 (power-save) - if ((err = libusb_set_configuration(usb_dev, 1)) < 0) - die("libusb_set_configuration: error %d", err); + if ((err = libusb_set_configuration(noct_dev, 2)) < 0) + return noct_error(err, "libusb_set_configuration failed"); - if ((err = libusb_claim_interface(usb_dev, 0)) < 0) - die("libusb_claim_interface: error %d", err); + if ((err = libusb_claim_interface(noct_dev, 0)) < 0) + return noct_error(err, "libusb_claim_interface failed"); + noct_iface_claimed = 1; for (int i=0; i<4; i++) { int done; - if ((err = libusb_interrupt_transfer(usb_dev, 0x02, (byte *) noct_magic[i] + 1, noct_magic[i][0], &done, 5000)) < 0) - die("Cannot send init packets: error %d", err); + if ((err = libusb_interrupt_transfer(noct_dev, 0x02, (byte *) noct_magic[i] + 1, noct_magic[i][0], &done, 5000)) < 0) + return noct_error(err, "Cannot send init packets"); if (done != noct_magic[i][0]) - die("Partial send of init packet: %d < %d", done, noct_magic[i][0]); + return noct_error(err, stk_printf("Partial send of init packet (%d < %d)", done, noct_magic[i][0])); } -#if 0 - byte xxx[] = { 0x7f, 0x01 }; - int done; - libusb_interrupt_transfer(usb_dev, 0x02, xxx, 2, &done, 5000); -#endif - noct_read_init(); noct_write_init(); schedule_update(); } -bool noct_is_ready(void) +static int noct_error_handler(struct main_hook *h) { - return !!usb_dev; // FIXME -} + DBG("Noct: Entered error handling hook"); + hook_del(h); -void noct_init(void) -{ - int err; + if (noct_dev) + { + if (noct_read_xfer) + { + if (noct_read_pending) + { + DBG("Noct: Cancelling pending read"); + libusb_cancel_transfer(noct_read_xfer); + noct_read_pending = 0; + } + DBG("Noct: Tearing down read xfer"); + xfree(noct_read_xfer->buffer); + libusb_free_transfer(noct_read_xfer); + noct_read_xfer = NULL; + } + if (noct_write_xfer) + { + if (noct_write_pending) + { + DBG("Noct: Cancelling pending write"); + libusb_cancel_transfer(noct_write_xfer); + noct_write_pending = 0; + } + DBG("Noct: Tearing down write xfer"); + xfree(noct_write_xfer->buffer); + libusb_free_transfer(noct_write_xfer); + noct_write_xfer = NULL; + } + if (noct_iface_claimed) + { + DBG("Noct: Unclaiming interface"); + libusb_release_interface(noct_dev, 0); + noct_iface_claimed = 0; + } + DBG("Noct: Resetting device"); + libusb_reset_device(noct_dev); + libusb_close(noct_dev); + noct_dev = NULL; + } - // Initialize libusb - if ((err = libusb_init(&usb_ctx)) < 0) - die("libusb_init failed: error %d", err); - libusb_set_debug(usb_ctx, 3); + DBG("Noct: Scheduling rescan after error"); + timer_add_rel(&noct_connect_timer, 3000); - // Connect libusb to UCW mainloop + return HOOK_IDLE; +} - if (!libusb_pollfds_handle_timeouts(usb_ctx)) - die("Unsupported version of libusb, please fix me"); +static void noct_error(int usb_err, char *text) +{ + if (usb_err) + msg(L_ERROR, "Nocturn: %s: error %d (%s)", text, usb_err, libusb_error_name(usb_err)); + else + msg(L_ERROR, "Nocturn: %s", text); - GARY_INIT_ZERO(usb_fds, 0); - libusb_set_pollfd_notifiers(usb_ctx, usb_added_fd, usb_removed_fd, NULL); + DBG("Noct: Scheduling error handling hook"); + hook_add(&noct_error_hook); +} - const struct libusb_pollfd **fds = libusb_get_pollfds(usb_ctx); - ASSERT(fds); - for (int i=0; fds[i]; i++) - usb_added_fd(fds[i]->fd, fds[i]->events, NULL); - free(fds); +bool noct_is_ready(void) +{ + return !!noct_dev; +} + +void noct_init(void) +{ + // Prepare error handling hook + noct_error_hook.handler = noct_error_handler; // Schedule search for the Nocturn noct_connect_timer.handler = noct_connect; - timer_add_rel(&noct_connect_timer, 0); + timer_add_rel(&noct_connect_timer, 100); }