commit 179da8afe61753453bc70a93ba0f0f4081e06f4d
author Blue Swirl <blauwirbel@gmail.com> Mon Sep 07 19:00:18 2009 +0000
committer Blue Swirl <blauwirbel@gmail.com> Mon Sep 07 19:00:18 2009 +0000
tree e75dc074086c30322a2f7b43307b1eb3b11172f3
parent 1e43a8e4d263809aa4e606a8a16667fbfd0d754f

USB: use opaque parameter passing for monitor handle

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

usb-linux.c

diff --git a/usb-linux.c b/usb-linux.c
index 043f6b6..036b39b 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -1605,12 +1605,11 @@
     return p->class_name;
 }
 
-static void usb_info_device(int bus_num, int addr, int class_id,
+static void usb_info_device(Monitor *mon, int bus_num, int addr, int class_id,
                             int vendor_id, int product_id,
                             const char *product_name,
                             int speed)
 {
-    Monitor *mon = cur_mon;
     const char *class_str, *speed_str;
 
     switch(speed) {
@@ -1647,7 +1646,9 @@
                                 const char *product_name,
                                 int speed)
 {
-    usb_info_device(bus_num, addr, class_id, vendor_id, product_id,
+    Monitor *mon = opaque;
+
+    usb_info_device(mon, bus_num, addr, class_id, vendor_id, product_id,
                     product_name, speed);
     return 0;
 }
@@ -1672,7 +1673,7 @@
 {
     struct USBAutoFilter *f;
 
-    usb_host_scan(NULL, usb_host_info_device);
+    usb_host_scan(mon, usb_host_info_device);
 
     if (usb_auto_filter)
         monitor_printf(mon, "  Auto filters:\n");