From a97871b397adfdf201705621266d4dc242ab9cfd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 7 May 2009 10:48:47 -0700
Subject: [PATCH] IGN:Allow remapping of LUNS in usbmb driver to support
 devices that don't use lun0 for the main memory

---
 src/calibre/devices/usbms/device.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index f84af1853b..9f6b3cbd34 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -40,7 +40,7 @@ class Device(_Device):
           <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s">
               <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s">
                 %(BCD_start)s
-                  <match key="@info.parent:storage.lun" int="0">
+                  <match key="@info.parent:storage.lun" int="%(lun0)d">
                           <merge key="volume.label" type="string">%(main_memory)s</merge>
                           <merge key="%(app)s.mainvolume" type="string">%(deviceclass)s</merge>
                   </match>
@@ -54,7 +54,7 @@ class Device(_Device):
           <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s">
               <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s">
                 %(BCD_start)s
-                  <match key="@info.parent:storage.lun" int="1">
+                  <match key="@info.parent:storage.lun" int="%(lun1)d">
                           <merge key="volume.label" type="string">%(storage_card)s</merge>
                           <merge key="%(app)s.cardvolume" type="string">%(deviceclass)s</merge>
                   </match>
@@ -65,6 +65,7 @@ class Device(_Device):
   </device>
 '''
     FDI_BCD_TEMPLATE = '<match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.device_revision_bcd" int="%(bcd)s">'
+    FDI_LUNS = {'lun0':0, 'lun1':1, 'lun2':2}
 
 
     def __init__(self, key='-1', log_packets=False, report_progress=None) :
@@ -85,6 +86,8 @@ class Device(_Device):
                                        storage_card=cls.STORAGE_CARD_VOLUME_LABEL,
                                   )
 
+                fdi_base_values.update(cls.FDI_LUNS)
+
                 if cls.BCD is None:
                     fdi_base_values['BCD_start'] = ''
                     fdi_base_values['BCD_end'] = ''
@@ -303,7 +306,7 @@ class Device(_Device):
             try:
                 self.open_linux()
             except DeviceError:
-                time.sleep(3)
+                time.sleep(7)
                 self.open_linux()
         if iswindows:
             try: