From bd77824db63ce73469c674bd346ce5cacb355f4a Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Sat, 1 Apr 2017 10:35:38 +0000
Subject: [PATCH] Store configuration and interface values in the USB device
 object.

---
 bochs/iodev/usb/usb_common.cc | 14 +++++++++-----
 bochs/iodev/usb/usb_common.h  |  3 ++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/bochs/iodev/usb/usb_common.cc b/bochs/iodev/usb/usb_common.cc
index 76222e4da..fdc081eca 100644
--- a/bochs/iodev/usb/usb_common.cc
+++ b/bochs/iodev/usb/usb_common.cc
@@ -468,11 +468,12 @@ int usb_device_c::handle_control_common(int request, int value, int index, int l
       break;
     case DeviceRequest | USB_REQ_GET_CONFIGURATION:
       BX_DEBUG(("USB_REQ_GET_CONFIGURATION:"));
-      data[0] = 1;
+      data[0] = d.config;
       ret = 1;
       break;
     case DeviceOutRequest | USB_REQ_SET_CONFIGURATION:
-      BX_DEBUG(("USB_REQ_SET_CONFIGURATION:"));
+      BX_DEBUG(("USB_REQ_SET_CONFIGURATION: value=%d", value));
+      d.config = value;
       d.state = USB_STATE_CONFIGURED;
       ret = 0;
       break;
@@ -489,12 +490,13 @@ int usb_device_c::handle_control_common(int request, int value, int index, int l
       }
       break;
     case InterfaceRequest | USB_REQ_GET_INTERFACE:
-      BX_DEBUG(("USB_REQ_GET_INFTERFACE:"));
-      data[0] = 0;
+      BX_DEBUG(("USB_REQ_GET_INTERFACE:"));
+      data[0] = d.interface;
       ret = 1;
       break;
     case InterfaceOutRequest | USB_REQ_SET_INTERFACE:
-      BX_DEBUG(("USB_REQ_SET_INFTERFACE:"));
+      BX_DEBUG(("USB_REQ_SET_INTERFACE: value=%d", value));
+      d.interface = value;
       ret = 0;
       break;
   }
@@ -506,6 +508,8 @@ void usb_device_c::register_state(bx_list_c *parent)
   d.sr = parent;
   bx_list_c *list = new bx_list_c(parent, "d", "Common USB Device State");
   BXRS_DEC_PARAM_FIELD(list, addr, d.addr);
+  BXRS_DEC_PARAM_FIELD(list, config, d.config);
+  BXRS_DEC_PARAM_FIELD(list, interface, d.interface);
   BXRS_DEC_PARAM_FIELD(list, state, d.state);
   BXRS_DEC_PARAM_FIELD(list, remote_wakeup, d.remote_wakeup);
   register_state_specific(parent);
diff --git a/bochs/iodev/usb/usb_common.h b/bochs/iodev/usb/usb_common.h
index 70cc808e3..ca2976650 100644
--- a/bochs/iodev/usb/usb_common.h
+++ b/bochs/iodev/usb/usb_common.h
@@ -6,7 +6,7 @@
 //
 // Copyright (c) 2005       Fabrice Bellard
 // Copyright (C) 2009-2016  Benjamin D Lunt (fys [at] fysnet [dot] net)
-//               2009-2016  The Bochs Project
+//               2009-2017  The Bochs Project
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -222,6 +222,7 @@ protected:
     int speed;
     Bit8u addr;
     Bit8u config;
+    Bit8u interface;
     char devname[32];
 
     const Bit8u *dev_descriptor;