aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2012-06-22 12:19:35 -0500
committerDan Williams <dcbw@redhat.com>2012-06-22 12:19:35 -0500
commit8289a646fd19b6ddfba48214e94297ff96f731eb (patch)
tree7bab76f22f582c6d2c2ea5add4598852ae6b796e
parent0588ffc17ee31a5eedbb5d226e9dd586e374c26e (diff)
decode: harmonize with git master
-rw-r--r--decode/packet.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/decode/packet.py b/decode/packet.py
index ab40a720..1259b124 100644
--- a/decode/packet.py
+++ b/decode/packet.py
@@ -31,8 +31,8 @@ URBF_GET_STATUS = 5
URBF_CONTROL = 6
URBF_SET_FEATURE = 7
URBF_ABORT_PIPE = 8
-URBF_CLEAR_FEATURE = 9
-URBF_CLASS_INTF = 10
+URBF_CLASS_IFACE = 9
+URBF_CLEAR_FEATURE = 10
funcs = {
"-- URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE:": (URBF_GET_DESC, False, None),
@@ -42,10 +42,9 @@ funcs = {
"-- URB_FUNCTION_GET_STATUS_FROM_DEVICE:": (URBF_GET_STATUS, False, None),
"-- URB_FUNCTION_CONTROL_TRANSFER:": (URBF_CONTROL, True, "C"),
"-- URB_FUNCTION_SET_FEATURE_TO_DEVICE:": (URBF_SET_FEATURE, False, None),
- "-- URB_FUNCTION_ABORT_PIPE:": (URBF_ABORT_PIPE, False, None),
- "-- URB_FUNCTION_CLEAR_FEATURE_TO_DEVICE:": (URBF_CLEAR_FEATURE, False, None),
- "-- URB_FUNCTION_CLEAR_FEATURE_TO_DEVICE:": (URBF_CLEAR_FEATURE, False, None),
- "-- URB_FUNCTION_CLASS_INTERFACE:": (URBF_CLASS_INTF, False, None)
+ "-- URB_FUNCTION_ABORT_PIPE:": (URBF_SET_FEATURE, False, None),
+ "-- URB_FUNCTION_CLASS_INTERFACE:": (URBF_CLASS_IFACE, False, None),
+ "-- URB_FUNCTION_CLEAR_FEATURE_TO_DEVICE:": (URBF_CLEAR_FEATURE, False, None)
}
def get_urb_info(l):