Remove more fpusb remnants

1 files changed, 23 insertions, 23 deletions

diff --git a/libusb/core.c b/libusb/core.c
index 6b2f126..9fca011 100644
--- a/libusb/core.c
+++ b/libusb/core.c
@@ -53,17 +53,17 @@ static int scan_device(char *busdir, const char *devnum)
 		return -1;
 
 	snprintf(path, PATH_MAX, "%s/%s", busdir, devnum);
-	fp_dbg("%s", path);
+	usbi_dbg("%s", path);
 	fd = open(path, O_RDWR);
 	if (!fd) {
-		fp_dbg("open '%s' failed, ret=%d errno=%d", path, fd, errno);
+		usbi_dbg("open '%s' failed, ret=%d errno=%d", path, fd, errno);
 		r = -1;
 		goto err;
 	}
 
 	r = read(fd, raw_desc, DEVICE_DESC_LENGTH);
 	if (r < 0) {
-		fp_err("read failed ret=%d errno=%d", r, errno);
+		usbi_err("read failed ret=%d errno=%d", r, errno);
 		goto err;
 	}
 	/* FIXME: short read handling? */
@@ -72,13 +72,13 @@ static int scan_device(char *busdir, const char *devnum)
 
 	/* Now try to fetch the rest of the descriptors */
 	if (dev->desc.bNumConfigurations > USB_MAXCONFIG) {
-		fp_err("too many configurations");
+		usbi_err("too many configurations");
 		r = -1;
 		goto err;
 	}
 
 	if (dev->desc.bNumConfigurations < 1) {
-		fp_dbg("no configurations?");
+		usbi_dbg("no configurations?");
 		r = -1;
 		goto err;
 	}
@@ -99,7 +99,7 @@ static int scan_device(char *busdir, const char *devnum)
 		/* Get the first 8 bytes to figure out what the total length is */
 		r = read(fd, buffer, sizeof(buffer));
 		if (r < sizeof(buffer)) {
-			fp_err("short descriptor read (%d/%d)", r, sizeof(buffer));
+			usbi_err("short descriptor read (%d/%d)", r, sizeof(buffer));
 			goto err;
 		}
 
@@ -115,14 +115,14 @@ static int scan_device(char *busdir, const char *devnum)
 		tmp = config.wTotalLength - 8;
 		r = read(fd, bigbuffer + 8, tmp);
 		if (r < tmp) {
-			fp_err("short descriptor read (%d/%d)", r, tmp);
+			usbi_err("short descriptor read (%d/%d)", r, tmp);
 			free(bigbuffer);
 			goto err;
 		}
 
 		r = usbi_parse_configuration(&dev->config[i], bigbuffer);
 		if (r > 0)
-			fp_warn("descriptor data still left\n");
+			usbi_warn("descriptor data still left\n");
 		free(bigbuffer);
 	}
 
@@ -130,7 +130,7 @@ static int scan_device(char *busdir, const char *devnum)
 	if (!dev->nodepath)
 		goto err;
 
-	fp_dbg("found device %04x:%04x", dev->desc.idVendor, dev->desc.idProduct);
+	usbi_dbg("found device %04x:%04x", dev->desc.idVendor, dev->desc.idProduct);
 	list_add(&dev->list, &usb_devs);
 	r = 0;
 
@@ -149,10 +149,10 @@ static int scan_busdir(const char *busnum)
 	struct dirent *entry;
 
 	snprintf(dirpath, PATH_MAX, "%s/%s", USBFS_PATH, busnum);
-	fp_dbg("%s", dirpath);
+	usbi_dbg("%s", dirpath);
 	dir = opendir(dirpath);
 	if (!dir) {
-		fp_err("opendir '%s' failed, errno=%d", dirpath, errno);
+		usbi_err("opendir '%s' failed, errno=%d", dirpath, errno);
 		return -1;
 	}
 
@@ -170,11 +170,11 @@ API_EXPORTED int libusb_find_devices(void)
 {
 	DIR *buses;
 	struct dirent *entry;
-	fp_dbg("");
+	usbi_dbg("");
 
 	buses = opendir(USBFS_PATH);
 	if (!buses) {
-		fp_err("opendir buses failed errno=%d", errno);
+		usbi_err("opendir buses failed errno=%d", errno);
 		return -1;
 	}
 
@@ -220,11 +220,11 @@ API_EXPORTED struct libusb_dev_handle *libusb_open(struct libusb_dev *dev)
 {
 	struct libusb_dev_handle *devh;
 	int fd;
-	fp_dbg("open %04x:%04x", dev->desc.idVendor, dev->desc.idProduct);
+	usbi_dbg("open %04x:%04x", dev->desc.idVendor, dev->desc.idProduct);
 
 	fd = open(dev->nodepath, O_RDWR);
 	if (!fd) {
-		fp_err("open failed, code %d errno %d", fd, errno);
+		usbi_err("open failed, code %d errno %d", fd, errno);
 		return NULL;
 	}
 
@@ -249,7 +249,7 @@ API_EXPORTED void libusb_close(struct libusb_dev_handle *devh)
 {
 	if (!devh)
 		return;
-	fp_dbg("");
+	usbi_dbg("");
 
 	list_del(&devh->list);
 	do_close(devh);
@@ -265,11 +265,11 @@ API_EXPORTED int libusb_claim_interface(struct libusb_dev_handle *dev,
 	int iface)
 {
 	int r;
-	fp_dbg("interface %d", iface);
+	usbi_dbg("interface %d", iface);
 	
 	r = ioctl(dev->fd, IOCTL_USB_CLAIMINTF, &iface);
 	if (r < 0)
-		fp_err("claim interface failed, error %d", r);
+		usbi_err("claim interface failed, error %d", r);
 	return r;
 }
 
@@ -277,18 +277,18 @@ API_EXPORTED int libusb_release_interface(struct libusb_dev_handle *dev,
 	int iface)
 {
 	int r;
-	fp_dbg("interface %d", iface);
+	usbi_dbg("interface %d", iface);
 
 	r = ioctl(dev->fd, IOCTL_USB_RELEASEINTF, &iface);
 	if (r < 0)
-		fp_err("release interface failed, error %d", r);
+		usbi_err("release interface failed, error %d", r);
 	return r;
 }
 
 API_EXPORTED int libusb_init(int signum)
 {
 	/* FIXME: find correct usb node path */
-	fp_dbg("");
+	usbi_dbg("");
 	list_init(&usb_devs);
 	list_init(&open_devs);
 	return usbi_io_init(signum);
@@ -297,9 +297,9 @@ API_EXPORTED int libusb_init(int signum)
 API_EXPORTED void libusb_exit(void)
 {
 	struct libusb_dev_handle *devh;
-	fp_dbg("");
+	usbi_dbg("");
 	if (!list_empty(&open_devs)) {
-		fp_dbg("naughty app left some devices open!\n");
+		usbi_dbg("naughty app left some devices open!\n");
 		list_for_each_entry(devh, &open_devs, list)
 			do_close(devh);
 	}