From dab0d183a21a32c96c7d1b25e609bd976082ca8b Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@almesberger.net>
Date: Mon, 1 Apr 2013 14:40:14 -0300
Subject: [PATCH] atusb/fw/include/atusb/usb-ids.h: remove (and adapt former
 users)

---
 atusb/fw/include/atusb/usb-ids.h | 28 ----------------------------
 tools/lib/atusb-common.c         |  3 +--
 tools/lib/atusb-spi.c            |  5 ++---
 tools/lib/atusb.c                |  5 ++---
 4 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 atusb/fw/include/atusb/usb-ids.h

diff --git a/atusb/fw/include/atusb/usb-ids.h b/atusb/fw/include/atusb/usb-ids.h
deleted file mode 100644
index 5b094fd..0000000
--- a/atusb/fw/include/atusb/usb-ids.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * include/atusb/usb-ids.h - USB vendor and product IDs
- *
- * Written 2009, 2010 by Werner Almesberger
- * Copyright 2009, 2010 Werner Almesberger
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-
-#ifndef USB_IDS_H
-#define USB_IDS_H
-
-/*
- *  Platform-specific settings
- *
- * USB_VENDOR = Qi Hardware
- * USB_PRODUCT = 802.15.4, device 0
- *                   -- -         -
- */
-
-#define USB_VENDOR	0x20b7	/* Qi Hardware */
-#define USB_PRODUCT	0x1540	/* ben-wpan, AT86RF230-based */
-
-#endif /* !USB_IDS_H */
diff --git a/tools/lib/atusb-common.c b/tools/lib/atusb-common.c
index 9102833..d43a168 100644
--- a/tools/lib/atusb-common.c
+++ b/tools/lib/atusb-common.c
@@ -19,7 +19,6 @@
 #include <errno.h>
 
 #include "atusb/ep0.h"
-#include "atusb/usb-ids.h"
 
 #include "at86rf230.h"
 #include "usbopen.h"
@@ -61,7 +60,7 @@ void *atusb_open(const char *arg)
 	usb_unrestrict();
 	if (arg)
 		restrict_usb_path(arg);
-	dev = open_usb(USB_VENDOR, USB_PRODUCT);
+	dev = open_usb(ATUSB_VENDOR_ID, ATUSB_PRODUCT_ID);
 	if (!dev) {
 		if (errno == EPERM)
 			fprintf(stderr, "Permission denied. "
diff --git a/tools/lib/atusb-spi.c b/tools/lib/atusb-spi.c
index d770dc5..c44c2ca 100644
--- a/tools/lib/atusb-spi.c
+++ b/tools/lib/atusb-spi.c
@@ -1,8 +1,8 @@
 /*
  * lib/atusb_spi.c - ATRF access functions library (USB-SPI version)
  *
- * Written 2010-2011 by Werner Almesberger
- * Copyright 2010-2011 Werner Almesberger
+ * Written 2010-2011, 2013 by Werner Almesberger
+ * Copyright 2010-2011, 2013 Werner Almesberger
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
 #include <usb.h>
 
 #include "atusb/ep0.h"
-#include "atusb/usb-ids.h"
 
 #include "usbopen.h"
 #include "at86rf230.h"
diff --git a/tools/lib/atusb.c b/tools/lib/atusb.c
index 538f101..d549278 100644
--- a/tools/lib/atusb.c
+++ b/tools/lib/atusb.c
@@ -1,8 +1,8 @@
 /*
  * lib/atusb.c - ATUSB access functions library (USB version)
  *
- * Written 2010-2011 by Werner Almesberger
- * Copyright 2010-2011 Werner Almesberger
+ * Written 2010-2011, 2013 by Werner Almesberger
+ * Copyright 2010-2011, 2013 Werner Almesberger
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@
 #include <usb.h>
 
 #include "atusb/ep0.h"
-#include "atusb/usb-ids.h"
 
 #include "usbopen.h"
 #include "driver.h"