From e65f3f372bde3b8abb1a65aa1f1b0157103be4c9 Mon Sep 17 00:00:00 2001
From: chrysn <chrysn@fsfe.org>
Date: Thu, 16 Jan 2020 18:59:04 +0100
Subject: [PATCH] USB VID/PID: Set whitelist define for internals that use
 usb.h

This list is probably incomplete as it was created experimentally.
---
 cpu/nrf52/periph/usbdev.c              | 3 +++
 cpu/sam0_common/periph/usbdev.c        | 3 +++
 drivers/periph_common/init.c           | 2 ++
 sys/auto_init/netif/auto_init_cdcecm.c | 2 ++
 sys/auto_init/usb/auto_init_usb.c      | 2 ++
 sys/usb/usbus/cdc/acm/cdc_acm.c        | 2 ++
 sys/usb/usbus/cdc/acm/cdc_acm_stdio.c  | 2 ++
 sys/usb/usbus/cdc/ecm/cdc_ecm.c        | 2 ++
 sys/usb/usbus/cdc/ecm/cdc_ecm_netdev.c | 2 ++
 sys/usb/usbus/usbus.c                  | 2 ++
 sys/usb/usbus/usbus_control.c          | 3 +++
 sys/usb/usbus/usbus_control_slicer.c   | 2 ++
 sys/usb/usbus/usbus_fmt.c              | 2 ++
 13 files changed, 29 insertions(+)

diff --git a/cpu/nrf52/periph/usbdev.c b/cpu/nrf52/periph/usbdev.c
index 2cc8ba7024..8e0b0a6be9 100644
--- a/cpu/nrf52/periph/usbdev.c
+++ b/cpu/nrf52/periph/usbdev.c
@@ -19,6 +19,9 @@
  * @author      Koen Zandberg <koen@bergzand.net>
  * @}
  */
+
+#define USB_H_USER_IS_RIOT_INTERNAL
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/cpu/sam0_common/periph/usbdev.c b/cpu/sam0_common/periph/usbdev.c
index 23836a4a2b..9230371cfe 100644
--- a/cpu/sam0_common/periph/usbdev.c
+++ b/cpu/sam0_common/periph/usbdev.c
@@ -15,6 +15,9 @@
  * @author  Koen Zandberg <koen@bergzand.net>
  * @}
  */
+
+#define USB_H_USER_IS_RIOT_INTERNAL
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/drivers/periph_common/init.c b/drivers/periph_common/init.c
index 73aeb4c499..099776e48c 100644
--- a/drivers/periph_common/init.c
+++ b/drivers/periph_common/init.c
@@ -20,6 +20,8 @@
  * @}
  */
 
+#define USB_H_USER_IS_RIOT_INTERNAL
+
 #ifdef MODULE_PERIPH_I2C
 #include "periph/i2c.h"
 #endif
diff --git a/sys/auto_init/netif/auto_init_cdcecm.c b/sys/auto_init/netif/auto_init_cdcecm.c
index 5bf9e2229c..617e85b2a4 100644
--- a/sys/auto_init/netif/auto_init_cdcecm.c
+++ b/sys/auto_init/netif/auto_init_cdcecm.c
@@ -19,6 +19,8 @@
 
 #ifdef MODULE_USBUS_CDC_ECM
 
+#define USB_H_USER_IS_RIOT_INTERNAL
+
 #include "log.h"
 #include "usb/usbus/cdc/ecm.h"
 #include "net/gnrc/netif/ethernet.h"
diff --git a/sys/auto_init/usb/auto_init_usb.c b/sys/auto_init/usb/auto_init_usb.c
index 5c84350059..dfcabbd5d3 100644
--- a/sys/auto_init/usb/auto_init_usb.c
+++ b/sys/auto_init/usb/auto_init_usb.c
@@ -22,6 +22,8 @@
  * @}
  */
 
+#define USB_H_USER_IS_RIOT_INTERNAL
+
 #include "usb/usbus.h"
 
 #ifdef MODULE_USBUS_CDC_ECM
diff --git a/sys/usb/usbus/cdc/acm/cdc_acm.c b/sys/usb/usbus/cdc/acm/cdc_acm.c
index f48509ce77..df79b99b0c 100644
--- a/sys/usb/usbus/cdc/acm/cdc_acm.c
+++ b/sys/usb/usbus/cdc/acm/cdc_acm.c
@@ -16,6 +16,8 @@
  * @}
  */
 
+#define USB_H_USER_IS_RIOT_INTERNAL
+
 #include <string.h>
 
 #include "tsrb.h"
diff --git a/sys/usb/usbus/cdc/acm/cdc_acm_stdio.c b/sys/usb/usbus/cdc/acm/cdc_acm_stdio.c
index 35903ed033..f6b192e2a3 100644
--- a/sys/usb/usbus/cdc/acm/cdc_acm_stdio.c
+++ b/sys/usb/usbus/cdc/acm/cdc_acm_stdio.c
@@ -19,6 +19,8 @@
  * @}
  */
 
+#define USB_H_USER_IS_RIOT_INTERNAL
+
 #include <stdio.h>
 
 #include "isrpipe.h"
diff --git a/sys/usb/usbus/cdc/ecm/cdc_ecm.c b/sys/usb/usbus/cdc/ecm/cdc_ecm.c
index 4065035f3b..752b850c76 100644
--- a/sys/usb/usbus/cdc/ecm/cdc_ecm.c
+++ b/sys/usb/usbus/cdc/ecm/cdc_ecm.c
@@ -15,6 +15,8 @@
  * @}
  */
 
+#define USB_H_USER_IS_RIOT_INTERNAL
+
 #include "event.h"
 #include "fmt.h"
 #include "kernel_defines.h"
diff --git a/sys/usb/usbus/cdc/ecm/cdc_ecm_netdev.c b/sys/usb/usbus/cdc/ecm/cdc_ecm_netdev.c
index cc2391e5b2..766e97a45e 100644
--- a/sys/usb/usbus/cdc/ecm/cdc_ecm_netdev.c
+++ b/sys/usb/usbus/cdc/ecm/cdc_ecm_netdev.c
@@ -15,6 +15,8 @@
  * @}
  */
 
+#define USB_H_USER_IS_RIOT_INTERNAL
+
 #include <string.h>
 
 #include "kernel_defines.h"
diff --git a/sys/usb/usbus/usbus.c b/sys/usb/usbus/usbus.c
index f2fd74f90a..46e2d1c4d3 100644
--- a/sys/usb/usbus/usbus.c
+++ b/sys/usb/usbus/usbus.c
@@ -16,6 +16,8 @@
  * @}
  */
 
+#define USB_H_USER_IS_RIOT_INTERNAL
+
 #include "bitarithm.h"
 #include "event.h"
 #include "thread.h"
diff --git a/sys/usb/usbus/usbus_control.c b/sys/usb/usbus/usbus_control.c
index b1cd84d87b..ed280b6dcc 100644
--- a/sys/usb/usbus/usbus_control.c
+++ b/sys/usb/usbus/usbus_control.c
@@ -15,6 +15,9 @@
  * @author  Koen Zandberg <koen@bergzand.net>
  * @}
  */
+
+#define USB_H_USER_IS_RIOT_INTERNAL
+
 #include "periph/usbdev.h"
 #include "usb/descriptor.h"
 #include "usb/usbus.h"
diff --git a/sys/usb/usbus/usbus_control_slicer.c b/sys/usb/usbus/usbus_control_slicer.c
index 31018c6283..ac30f0a863 100644
--- a/sys/usb/usbus/usbus_control_slicer.c
+++ b/sys/usb/usbus/usbus_control_slicer.c
@@ -16,6 +16,8 @@
  * @}
  */
 
+#define USB_H_USER_IS_RIOT_INTERNAL
+
 #include <string.h>
 #include "periph/usbdev.h"
 #include "usb/usbus.h"
diff --git a/sys/usb/usbus/usbus_fmt.c b/sys/usb/usbus/usbus_fmt.c
index 5299169934..edeacbaf88 100644
--- a/sys/usb/usbus/usbus_fmt.c
+++ b/sys/usb/usbus/usbus_fmt.c
@@ -16,6 +16,8 @@
  * @}
  */
 
+#define USB_H_USER_IS_RIOT_INTERNAL
+
 #include <string.h>
 #include <stdio.h>
 #include "usb/descriptor.h"