From 790d6119bf1e30148ebc24aef25c435ccea1eea4 Mon Sep 17 00:00:00 2001 From: pete-cs Date: Wed, 19 Jun 2013 19:22:03 +0000 Subject: [PATCH] add (hopefully) support for vendors git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1607 12e2690d-a6be-4b82-a7b7-67c4a43b65c8 --- client/USBClass.py | 10 ---------- client/USBDevice.py | 2 +- client/USBInterface.py | 1 + 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/client/USBClass.py b/client/USBClass.py index daac236..343d4e3 100644 --- a/client/USBClass.py +++ b/client/USBClass.py @@ -23,13 +23,3 @@ class USBClass: """To be overridden for subclasses to modify self.class_request_handlers""" pass - def handle_class_request(self, req): - r = req.get_request() - - if r in self.class_request_handlers: - self.class_request_handlers[r](req) - else: - print(self.name, "unhandled class request:", req) - print(self.name, "stalling") - self.device.stall_ep0() - diff --git a/client/USBDevice.py b/client/USBDevice.py index 4a2ba13..29450b4 100644 --- a/client/USBDevice.py +++ b/client/USBDevice.py @@ -151,7 +151,7 @@ class USBDevice: elif req_type == USB.request_type_class: handler_entity = recipient.device_class elif req_type == USB.request_type_vendor: - handler_entity = recipient.get_device_vendor() + handler_entity = recipient.device_vendor if not handler_entity: print(self.name, "invalid handler entity, stalling") diff --git a/client/USBInterface.py b/client/USBInterface.py index c3b1bfe..ddc30cc 100644 --- a/client/USBInterface.py +++ b/client/USBInterface.py @@ -36,6 +36,7 @@ class USBInterface: e.set_interface(self) self.device_class = None + self.device_vendor = None def set_configuration(self, config): self.configuration = config -- 2.20.1