Support hot unplugging

diff --git a/bus/usb/usb.c b/bus/usb/usb.c
index b3eaeba0e8844b19d3501a5640e778becd813cdd..2bd805ef24c673d6648e17dad280ef69b77e73ea 100644 (file)
--- a/bus/usb/usb.c
+++ b/bus/usb/usb.c
@@ -22,7 +22,7 @@
 #include <grub/usb.h>
 #include <grub/misc.h>
 #include <grub/list.h>
-#include <grub/dl.h>
+#include <grub/term.h>
 
 static grub_usb_controller_dev_t grub_usb_list;
 struct grub_usb_attach_desc *attach_hooks;
@@ -334,3 +334,14 @@ grub_usb_unregister_attach_hook_class (struct grub_usb_attach_desc *desc)
 {
   grub_list_remove (GRUB_AS_LIST_P (&attach_hooks), GRUB_AS_LIST (desc));  
 }
+
+
+GRUB_MOD_INIT(usb)
+{
+  grub_term_poll_usb = grub_usb_poll_devices;
+}
+
+GRUB_MOD_FINI(usb)
+{
+  grub_term_poll_usb = NULL;
+}

diff --git a/bus/usb/usbhub.c b/bus/usb/usbhub.c
index 6c14f4b8de6000273f3bedbea6c3628f90a0cf3d..7f2c8d24bc1e78a6e4356cbc4657079d2b0bb02a 100644 (file)
--- a/bus/usb/usbhub.c
+++ b/bus/usb/usbhub.c
@@ -33,7 +33,7 @@ struct grub_usb_hub
   struct grub_usb_hub *next;
   grub_usb_controller_t controller;
   int nports;
-  grub_usb_speed_t *speed;
+  struct grub_usb_device **devices;
   grub_usb_device_t dev;
 };
 
@@ -104,7 +104,7 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller, grub_usb_speed_t speed)
 }
 
 \f
-static grub_err_t
+static grub_usb_err_t
 grub_usb_add_hub (grub_usb_device_t dev)
 {
   struct grub_usb_usb_hubdesc hubdesc;
@@ -112,6 +112,7 @@ grub_usb_add_hub (grub_usb_device_t dev)
   int i;
   grub_uint64_t timeout;
   grub_usb_device_t next_dev;
+  grub_usb_device_t *attached_devices;
   
   err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
                                    | GRUB_USB_REQTYPE_CLASS
@@ -130,6 +131,13 @@ grub_usb_add_hub (grub_usb_device_t dev)
   grub_dprintf ("usb", "Hub set configuration\n");
   grub_usb_set_configuration (dev, 1);
 
+  attached_devices = grub_zalloc (hubdesc.portcnt
+                                 * sizeof (attached_devices[0]));
+  if (!attached_devices)
+    return GRUB_USB_ERR_INTERNAL;
+  dev->children = attached_devices;
+  dev->nports = hubdesc.portcnt;
+
   /* Power on all Hub ports.  */
   for (i = 1; i <= hubdesc.portcnt; i++)
     {
@@ -236,6 +244,8 @@ grub_usb_add_hub (grub_usb_device_t dev)
           if (! next_dev)
             continue;
 
+         attached_devices[i - 1] = next_dev;
+
           /* If the device is a Hub, scan it for more devices.  */
           if (next_dev->descdev.class == 0x09)
             grub_usb_add_hub (next_dev);
@@ -246,27 +256,29 @@ grub_usb_add_hub (grub_usb_device_t dev)
 }
 
 static void
-attach_root_port (grub_usb_controller_t controller, int portno,
+attach_root_port (struct grub_usb_hub *hub, int portno,
                  grub_usb_speed_t speed)
 {
   grub_usb_device_t dev;
   grub_err_t err;
 
   /* Disable the port. XXX: Why? */
-  err = controller->dev->portstatus (controller, portno, 0);
+  err = hub->controller->dev->portstatus (hub->controller, portno, 0);
   if (err)
     return;
 
   /* Enable the port.  */
-  err = controller->dev->portstatus (controller, portno, 1);
+  err = hub->controller->dev->portstatus (hub->controller, portno, 1);
   if (err)
     return;
 
   /* Enable the port and create a device.  */
-  dev = grub_usb_hub_add_dev (controller, speed);
+  dev = grub_usb_hub_add_dev (hub->controller, speed);
   if (! dev)
     return;
 
+  hub->devices[portno] = dev;
+
   /* If the device is a Hub, scan it for more devices.  */
   if (dev->descdev.class == 0x09)
     grub_usb_add_hub (dev);
@@ -297,8 +309,8 @@ grub_usb_root_hub (grub_usb_controller_t controller)
 
   /* Query the number of ports the root Hub has.  */
   hub->nports = controller->dev->hubports (controller);
-  hub->speed = grub_malloc (sizeof (hub->speed[0]) * hub->nports);
-  if (!hub->speed)
+  hub->devices = grub_zalloc (sizeof (hub->devices[0]) * hub->nports);
+  if (!hub->devices)
     {
       grub_free (hub->controller);
       grub_free (hub);
@@ -307,36 +319,54 @@ grub_usb_root_hub (grub_usb_controller_t controller)
 
   for (i = 0; i < hub->nports; i++)
     {
-      hub->speed[i] = controller->dev->detect_dev (hub->controller, i,
-                                                   &changed);
+      grub_usb_speed_t speed;
+      speed = controller->dev->detect_dev (hub->controller, i,
+                                          &changed);
 
-      if (hub->speed[i] != GRUB_USB_SPEED_NONE)
-       attach_root_port (hub->controller, i, hub->speed[i]);
+      if (speed != GRUB_USB_SPEED_NONE)
+       attach_root_port (hub, i, speed);
     }
 
   return GRUB_USB_ERR_NONE;
 }
 
+static void detach_device (grub_usb_device_t dev);
+
+static void
+detach_device (grub_usb_device_t dev)
+{
+  unsigned i;
+  int k;
+  if (!dev)
+    return;
+  if (dev->descdev.class == GRUB_USB_CLASS_HUB)
+    {
+      for (i = 0; i < dev->nports; i++)
+       detach_device (dev->children[i]);
+      grub_free (dev->children);
+    }
+  for (i = 0; i < ARRAY_SIZE (dev->config); i++)
+    if (dev->config[i].descconf)
+      for (k = 0; k < dev->config[i].descconf->numif; k++)
+       {
+         struct grub_usb_interface *inter = &dev->config[i].interf[k];
+         if (inter && inter->detach_hook)
+           inter->detach_hook (dev, i, k);
+       }
+  grub_usb_devs[dev->addr] = 0;
+}
+
 static void
 poll_nonroot_hub (grub_usb_device_t dev)
 {
-  struct grub_usb_usb_hubdesc hubdesc;
   grub_err_t err;
-  int i;
+  unsigned i;
   grub_uint64_t timeout;
   grub_usb_device_t next_dev;
-  
-  err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
-                                   | GRUB_USB_REQTYPE_CLASS
-                                   | GRUB_USB_REQTYPE_TARGET_DEV),
-                              GRUB_USB_REQ_GET_DESCRIPTOR,
-                             (GRUB_USB_DESCRIPTOR_HUB << 8) | 0,
-                             0, sizeof (hubdesc), (char *) &hubdesc);
-  if (err)
-    return;
-    
+  grub_usb_device_t *attached_devices = dev->children;
+      
   /* Iterate over the Hub ports.  */
-  for (i = 1; i <= hubdesc.portcnt; i++)
+  for (i = 1; i <= dev->nports; i++)
     {
       grub_uint32_t status;
 
@@ -350,6 +380,12 @@ poll_nonroot_hub (grub_usb_device_t dev)
         status.  */
       if (err)
        continue;
+
+      if (status & GRUB_USB_HUB_STATUS_C_CONNECTED)
+       {
+         detach_device (attached_devices[i-1]);
+         attached_devices[i - 1] = NULL;
+       }
            
       /* Connected and status of connection changed ? */
       if ((status & GRUB_USB_HUB_STATUS_CONNECTED)
@@ -417,6 +453,8 @@ poll_nonroot_hub (grub_usb_device_t dev)
           if (! next_dev)
             continue;
 
+         attached_devices[i - 1] = next_dev;
+
           /* If the device is a Hub, scan it for more devices.  */
           if (next_dev->descdev.class == 0x09)
             grub_usb_add_hub (next_dev);
@@ -434,26 +472,23 @@ grub_usb_poll_devices (void)
 
   for (hub = hubs; hub; hub = hub->next)
     {
-      int changed=0;
       /* Do we have to recheck number of ports?  */
       /* No, it should be never changed, it should be constant. */
       for (i = 0; i < hub->nports; i++)
        {
          grub_usb_speed_t speed;
+         int changed = 0;
 
          speed = hub->controller->dev->detect_dev (hub->controller, i,
                                                    &changed);
 
-         if (speed != GRUB_USB_SPEED_NONE)
+         if (changed)
            {
-              if (changed)
-                attach_root_port (hub->controller, i, speed);
+             detach_device (hub->devices[i]);
+             hub->devices[i] = NULL;
+             if (speed != GRUB_USB_SPEED_NONE)
+                attach_root_port (hub, i, speed);
            }
-
-          /* XXX: There should be also handling
-           * of disconnected devices. */
-           
-         hub->speed[i] = speed;
        }
     }
 
@@ -463,9 +498,7 @@ grub_usb_poll_devices (void)
       grub_usb_device_t dev = grub_usb_devs[i];
 
       if (dev && dev->descdev.class == 0x09)
-       {
-          poll_nonroot_hub (dev);
-       }
+       poll_nonroot_hub (dev);
     }
 
 }

diff --git a/disk/usbms.c b/disk/usbms.c
index 225761e0f18f1d7b0b00418d5f8740c4d898a253..e63105ccc645d3d6b29688fd538f335d8d12b023 100644 (file)
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -65,6 +65,7 @@ typedef struct grub_usbms_dev *grub_usbms_dev_t;
 /* FIXME: remove limit.  */
 #define MAX_USBMS_DEVICES 128
 static grub_usbms_dev_t grub_usbms_devices[MAX_USBMS_DEVICES];
+static int first_available_slot = 0;
 
 static grub_err_t
 grub_usbms_reset (grub_usb_device_t dev, int interface)
@@ -96,13 +97,12 @@ grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno)
   unsigned curnum;
   grub_usb_err_t err;
 
-  for (curnum = 0; curnum < ARRAY_SIZE (grub_usbms_devices); curnum++)
-    if (!grub_usbms_devices[curnum])
-      break;
-
-  if (curnum == ARRAY_SIZE (grub_usbms_devices))
+  if (first_available_slot == ARRAY_SIZE (grub_usbms_devices))
     return 0;
 
+  curnum = first_available_slot;
+  first_available_slot++;
+
   interf = usbdev->config[configno].interf[interfno].descif;
 
   if ((interf->subclass != GRUB_USBMS_SUBCLASS_BULK

diff --git a/include/grub/term.h b/include/grub/term.h
index f40d935e47f3ea6b58340b15c679b7dce4a52a8f..734e4ab17ff23d035fe1fe8f497eb05fcbf883e0 100644 (file)
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -459,6 +459,7 @@ grub_print_spaces (struct grub_term_output *term, int number_spaces)
     grub_putcode (' ', term);
 }
 
+extern void (*EXPORT_VAR (grub_term_poll_usb)) (void);
 
 /* For convenience.  */
 #define GRUB_TERM_ASCII_CHAR(c)        ((c) & 0xff)

diff --git a/include/grub/usb.h b/include/grub/usb.h
index 5d0eb2082734c1c3c7d43f784aff9be9d32b9518..674f7ec461095baf5371427b0b8cabad7d570741 100644 (file)
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -177,6 +177,12 @@ struct grub_usb_device
 
   /* Data toggle values (used for bulk transfers only).  */
   int toggle[256];
+
+  /* Array of children for a hub.  */
+  grub_usb_device_t *children;
+
+  /* Number of hub ports.  */
+  unsigned nports;
 };
 
 \f

diff --git a/kern/term.c b/kern/term.c
index 47bd426fdf4c3e1aeb1fc9513af43da5afe17d39..360539e500f202a2177b5d20c5cf58088379d7f8 100644 (file)
--- a/kern/term.c
+++ b/kern/term.c
@@ -28,6 +28,8 @@ struct grub_term_input *grub_term_inputs_disabled;
 struct grub_term_output *grub_term_outputs;
 struct grub_term_input *grub_term_inputs;
 
+void (*grub_term_poll_usb) (void) = NULL;
+
 /* Put a Unicode character.  */
 static void
 grub_putcode_dumb (grub_uint32_t code,
@@ -85,6 +87,9 @@ grub_getkey (void)
 
   while (1)
     {
+      if (grub_term_poll_usb)
+       grub_term_poll_usb ();
+
       FOR_ACTIVE_TERM_INPUTS(term)
       {
        int key = term->checkkey (term);
@@ -101,6 +106,9 @@ grub_checkkey (void)
 {
   grub_term_input_t term;
 
+  if (grub_term_poll_usb)
+    grub_term_poll_usb ();
+
   FOR_ACTIVE_TERM_INPUTS(term)
   {
     int key = term->checkkey (term);
@@ -117,6 +125,9 @@ grub_getkeystatus (void)
   int status = 0;
   grub_term_input_t term;
 
+  if (grub_term_poll_usb)
+    grub_term_poll_usb ();
+
   FOR_ACTIVE_TERM_INPUTS(term)
   {
     if (term->getkeystatus)

diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index 62f5df352fc34ed58041427311e30d31c07225e0..b6bc05dbe06bce7c17e4522b47d68a074a9fa214 100644 (file)
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -95,14 +95,21 @@ grub_usb_keyboard_detach (grub_usb_device_t usbdev,
 {
   unsigned i;
   for (i = 0; i < ARRAY_SIZE (grub_usb_keyboards); i++)
-    if (grub_usb_keyboards[i].data && grub_usb_keyboards[i].data == usbdev)
-      {
-       grub_term_unregister_input (&grub_usb_keyboards[i]);
-       grub_free ((char *) grub_usb_keyboards[i].name);
-       grub_usb_keyboards[i].name = NULL;
-       grub_free (grub_usb_keyboards[i].data);
-       grub_usb_keyboards[i].data = 0;
-      }
+    {
+      struct grub_usb_keyboard_data *data = grub_usb_keyboards[i].data;
+
+      if (!data)
+       continue;
+
+      if (data->usbdev != usbdev)
+       continue;
+
+      grub_term_unregister_input (&grub_usb_keyboards[i]);
+      grub_free ((char *) grub_usb_keyboards[i].name);
+      grub_usb_keyboards[i].name = NULL;
+      grub_free (grub_usb_keyboards[i].data);
+      grub_usb_keyboards[i].data = 0;
+    }
 }
 
 static int