Browse Source

dname for lowlevel drivers

Luke Dashjr 12 years ago
parent
commit
e61f3a4803
5 changed files with 6 additions and 1 deletions
  1. 1 0
      fpgautils.c
  2. 1 0
      ft232r.c
  3. 2 1
      lowlevel.c
  4. 1 0
      lowlevel.h
  5. 1 0
      mcp2210.c

+ 1 - 0
fpgautils.c

@@ -1393,5 +1393,6 @@ int get_serial_cts(const int fd)
 #endif // ! WIN32
 #endif // ! WIN32
 
 
 struct lowlevel_driver lowl_vcom = {
 struct lowlevel_driver lowl_vcom = {
+	.dname = "vcom",
 	.devinfo_scan = vcom_devinfo_scan,
 	.devinfo_scan = vcom_devinfo_scan,
 };
 };

+ 1 - 0
ft232r.c

@@ -376,6 +376,7 @@ bool ft232r_get_cbus_bits(struct ft232r_device_handle *dev, bool *out_sio0, bool
 }
 }
 
 
 struct lowlevel_driver lowl_ft232r = {
 struct lowlevel_driver lowl_ft232r = {
+	.dname = "ft232r",
 	.devinfo_scan = ft232r_devinfo_scan,
 	.devinfo_scan = ft232r_devinfo_scan,
 	.devinfo_free = ft232r_devinfo_free,
 	.devinfo_free = ft232r_devinfo_free,
 };
 };

+ 2 - 1
lowlevel.c

@@ -68,8 +68,9 @@ void lowlevel_scan()
 	
 	
 	LL_FOREACH(devinfo_list, devinfo_mid_list)
 	LL_FOREACH(devinfo_list, devinfo_mid_list)
 	{
 	{
-		applog(LOG_DEBUG, "%s: Found %s (path=%s, manuf=%s, prod=%s, serial=%s)",
+		applog(LOG_DEBUG, "%s: Found %s device at %s (path=%s, manuf=%s, prod=%s, serial=%s)",
 		       __func__,
 		       __func__,
+		       devinfo_mid_list->lowl->dname,
 		       devinfo_mid_list->devid,
 		       devinfo_mid_list->devid,
 		       devinfo_mid_list->path,
 		       devinfo_mid_list->path,
 		       devinfo_mid_list->manufacturer, devinfo_mid_list->product, devinfo_mid_list->serial);
 		       devinfo_mid_list->manufacturer, devinfo_mid_list->product, devinfo_mid_list->serial);

+ 1 - 0
lowlevel.h

@@ -10,6 +10,7 @@ struct lowlevel_device_info;
 typedef bool (*lowl_found_devinfo_func_t)(struct lowlevel_device_info *, void *);
 typedef bool (*lowl_found_devinfo_func_t)(struct lowlevel_device_info *, void *);
 
 
 struct lowlevel_driver {
 struct lowlevel_driver {
+	const char *dname;
 	struct lowlevel_device_info *(*devinfo_scan)();
 	struct lowlevel_device_info *(*devinfo_scan)();
 	void (*devinfo_free)(struct lowlevel_device_info *);
 	void (*devinfo_free)(struct lowlevel_device_info *);
 };
 };

+ 1 - 0
mcp2210.c

@@ -452,5 +452,6 @@ enum mcp2210_gpio_value mcp2210_get_gpio_input(struct mcp2210_device * const h,
 }
 }
 
 
 struct lowlevel_driver lowl_mcp2210 = {
 struct lowlevel_driver lowl_mcp2210 = {
+	.dname = "mcp2210",
 	.devinfo_scan = mcp2210_devinfo_scan,
 	.devinfo_scan = mcp2210_devinfo_scan,
 };
 };