From 31e3a273927c8da0d31489b5c7db29db699bfb90 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 2 Jul 2012 14:31:19 +0530
Subject: [PATCH] Create separate driver for Pocketbook 622 rather than using
 Android driver

---
 resources/compiled_coffeescript.zip   | Bin 43332 -> 43332 bytes
 src/calibre/customize/builtins.py     |   4 ++--
 src/calibre/devices/android/driver.py |   1 -
 src/calibre/devices/eb600/driver.py   |  13 +++++++++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip
index ae77254da8f689bd2542197920179ffd126ff5c8..d7fad735ba651cfe4b99775b7f301581150e1182 100644
GIT binary patch
delta 32
kcmX?diRs8CCf)#VW)=|!5cpg8Xd`dn3T7ZZIdR2f0Jt;^%>V!Z

delta 32
kcmX?diRs8CCf)#VW)=|!5V%<Ua3gQv3T7ZZIdR2f0JMS(cK`qY

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 495d923289..af5bfc74fb 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -643,7 +643,7 @@ from calibre.devices.cybook.driver import CYBOOK, ORIZON
 from calibre.devices.eb600.driver import (EB600, COOL_ER, SHINEBOOK,
                 POCKETBOOK360, GER2, ITALICA, ECLICTO, DBOOK, INVESBOOK,
                 BOOQ, ELONEX, POCKETBOOK301, MENTOR, POCKETBOOK602,
-                POCKETBOOK701, POCKETBOOK360P, PI2)
+                POCKETBOOK701, POCKETBOOK360P, PI2, POCKETBOOK622)
 from calibre.devices.iliad.driver import ILIAD
 from calibre.devices.irexdr.driver import IREXDR1000, IREXDR800
 from calibre.devices.jetbook.driver import (JETBOOK, MIBUK, JETBOOK_MINI,
@@ -689,7 +689,7 @@ plugins += [
     JETBOOK, JETBOOK_MINI, MIBUK, JETBOOK_COLOR,
     SHINEBOOK,
     POCKETBOOK360, POCKETBOOK301, POCKETBOOK602, POCKETBOOK701, POCKETBOOK360P,
-    PI2,
+    POCKETBOOK622, PI2,
     KINDLE, KINDLE2, KINDLE_DX, KINDLE_FIRE,
     NOOK, NOOK_COLOR,
     PRS505, PRST1,
diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index 2abfd9bbe9..822b309619 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -115,7 +115,6 @@ class ANDROID(USBMS):
                     0xc004 : [0x0226],
                     0x8801 : [0x0226, 0x0227],
                     0xe115 : [0x0216], # PocketBook A10
-                    0xe107 : [0x326], # PocketBook 622
             },
 
             # Acer
diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py
index 74c98b3716..4cf9ee5cf9 100644
--- a/src/calibre/devices/eb600/driver.py
+++ b/src/calibre/devices/eb600/driver.py
@@ -251,6 +251,19 @@ class POCKETBOOK602(USBMS):
     WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['PB602', 'PB603', 'PB902',
             'PB903', 'PB']
 
+class POCKETBOOK622(POCKETBOOK602):
+
+    name = 'PocketBook 622 Device Interface'
+    description    = _('Communicate with the PocketBook 622 reader.')
+    EBOOK_DIR_MAIN = ''
+
+    VENDOR_ID   = [0x0489]
+    PRODUCT_ID  = [0xe107]
+    BCD         = [0x0326]
+
+    VENDOR_NAME = 'LINUX'
+    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'FILE-STOR_GADGET'
+
 class POCKETBOOK360P(POCKETBOOK602):
 
     name = 'PocketBook 360+ Device Interface'