Nocturn: Do not write to a missing USB device

[ursary.git] / nocturn.c

diff --git a/nocturn.c b/nocturn.c
index 2e93f5c468c5bf36881d47f9fe05f67d925edd51..158f1407df6f58e2915a8699f3d7e4390ce2e14b 100644 (file)
--- a/nocturn.c
+++ b/nocturn.c
@@ -88,6 +88,8 @@ static const char noct_magic[4][9] = {
 
 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)
 {
@@ -140,6 +142,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;
@@ -160,6 +163,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;
@@ -168,6 +173,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;
@@ -177,6 +184,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;
@@ -186,6 +195,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;
            }
@@ -215,13 +225,13 @@ static void noct_read_init(void)
     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 bool noct_write_pending;
@@ -241,7 +251,7 @@ 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);
   ASSERT(!noct_write_pending);
@@ -260,14 +270,14 @@ static void noct_do_write(uns cmd, uns arg)
 
 static void noct_sched_write(void)
 {
-  if (noct_write_pending)
+  if (!usb_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)
     {
@@ -310,9 +320,9 @@ 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();
     }
@@ -325,6 +335,8 @@ static void noct_write_init(void)
   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);
 
+  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;
@@ -351,7 +363,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,7 +381,7 @@ 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)
     return noct_error(err, "libusb_open failed");