summaryrefslogtreecommitdiff
path: root/backend/canon_dr-cmd.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-02-01 15:25:04 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-02-01 15:25:04 +0100
commit8e5d399808d2270ae9d56c96560a021e594d18a4 (patch)
treecb83e4c8216cf0e8bcaa17a6f2cb64cf4d7f469a /backend/canon_dr-cmd.h
parent97e55bdc5cdf59304af739e65f416320bcbcf599 (diff)
parent302276dc1b90cfc972fb726ca94a23b18f4b0088 (diff)
Update upstream source from tag 'upstream/1.1.1'
Update to upstream version '1.1.1' with Debian dir 4cb81ae9eaa2503b9c320ac1e8125f9df6e7f7b3
Diffstat (limited to 'backend/canon_dr-cmd.h')
-rw-r--r--backend/canon_dr-cmd.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/backend/canon_dr-cmd.h b/backend/canon_dr-cmd.h
index 44751fa..e9fc54b 100644
--- a/backend/canon_dr-cmd.h
+++ b/backend/canon_dr-cmd.h
@@ -11,9 +11,7 @@
#define USB_HEADER_LEN 12
#define USB_COMMAND_LEN 12
#define USB_STATUS_LEN 4
-#define USB_COMMAND_TIME 30000
-#define USB_DATA_TIME 30000
-#define USB_STATUS_TIME 30000
+#define USB_PACKET_TIMEOUT 30000
/*static inline void */
static void
@@ -116,8 +114,10 @@ putnbyte (unsigned char *pnt, unsigned int value, unsigned int nbytes)
#define INQUIRY_code 0x12
#define INQUIRY_len 6
-#define INQUIRY_std_len 0x30
-#define INQUIRY_vpd_len 0x1e
+#define INQUIRY_std_max_len 0x30
+#define INQUIRY_std_typ_len 0x30
+#define INQUIRY_vpd_max_len 0x30
+#define INQUIRY_vpd_typ_len 0x1e
#define set_IN_evpd(icb, val) setbitfield(icb + 1, 1, 0, val)
#define set_IN_page_code(icb, val) icb[0x02]=val