From cb62a146b320f404c55f5b9bcb4d6d42b8c3ef0e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 9 Dec 2008 13:28:30 -0800
Subject: [PATCH] Fix #1365 (PRS-505 SD Storage card does not show up under
 Calibre 0.4.111)

---
 src/calibre/devices/prs505/driver.py | 8 +++++---
 src/calibre/devices/scanner.py       | 3 ++-
 src/calibre/manual/faq.rst           | 5 +++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/calibre/devices/prs505/driver.py b/src/calibre/devices/prs505/driver.py
index 698a8f2a03..dd4b8d575a 100644
--- a/src/calibre/devices/prs505/driver.py
+++ b/src/calibre/devices/prs505/driver.py
@@ -64,9 +64,11 @@ class PRS505(Device):
       <match key="info.category" string="volume">
           <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">
-                  <match key="volume.is_partition" bool="true">
-                      <merge key="volume.label" type="string">%(storage_card)s</merge>
-                      <merge key="%(app)s.cardvolume" type="string">%(deviceclass)s</merge>
+                  <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.device_revision_bcd" int="%(bcd)s">
+                      <match key="volume.is_partition" bool="true">
+                          <merge key="volume.label" type="string">%(storage_card)s</merge>
+                          <merge key="%(app)s.cardvolume" type="string">%(deviceclass)s</merge>
+                      </match>
                   </match>
               </match>
           </match>
diff --git a/src/calibre/devices/scanner.py b/src/calibre/devices/scanner.py
index 99a50020ec..40573114a7 100644
--- a/src/calibre/devices/scanner.py
+++ b/src/calibre/devices/scanner.py
@@ -43,7 +43,8 @@ class DeviceScanner(object):
         if iswindows:
             for device_id in self.devices:
                 vid, pid = 'vid_%4.4x'%device.VENDOR_ID, 'pid_%4.4x'%device.PRODUCT_ID
-                if vid in device_id and pid in device_id:
+                rev = ('rev_%4.4x'%device.BCD).replace('a', ':') # Bug in winutil.get_usb_devices converts a to :
+                if vid in device_id and pid in device_id and rev in device_id:
                     return True
             return False
         else:
diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst
index caea4af553..450f860640 100644
--- a/src/calibre/manual/faq.rst
+++ b/src/calibre/manual/faq.rst
@@ -153,8 +153,9 @@ Content From The Web
 My downloaded news content causes the reader to reset. 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 This is a bug in the SONY firmware. The problem can be mitigated by switching the output format to EPUB
-in the configuration dialog. EPUB files typically only cause the reader to reset when clicking on certain
-links. Alternatively, you can use the LRF output format and use the SONY software to transfer the files to the reader. The SONY software pre-paginates the LRF file, thereby reducing the number of resets.
+in the configuration dialog. Alternatively, you can use the LRF output format and use the SONY software 
+to transfer the files to the reader. The SONY software pre-paginates the LRF file, 
+thereby reducing the number of resets.
 
 I obtained a recipe for a news site as a .py file from somewhere, how do I use it?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~