remove many ifdef PANDA

board/drivers/usb.h

@@ -216,17 +216,10 @@ uint16_t string_manufacturer_desc[] = {
   'c', 'o', 'm', 'm', 'a', '.', 'a', 'i'
 };
 
-#ifdef PANDA
 uint16_t string_product_desc[] = {
   STRING_DESCRIPTOR_HEADER(5),
   'p', 'a', 'n', 'd', 'a'
 };
-#else
-uint16_t string_product_desc[] = {
-  STRING_DESCRIPTOR_HEADER(5),
-  'N', 'E', 'O', 'v', '1'
-};
-#endif
 
 // default serial number when we're not a panda
 uint16_t string_serial_desc[] = {
@@ -240,7 +233,6 @@ uint16_t string_configuration_desc[] = {
   '0', '1' // "01"
 };
 
-#ifdef PANDA
 // WCID (auto install WinUSB driver)
 // https://github.com/pbatard/libwdi/wiki/WCID-Devices
 // https://docs.microsoft.com/en-us/windows-hardware/drivers/usbcon/winusb-installation#automatic-installation-of--winusb-without-an-inf-file
@@ -390,8 +382,6 @@ uint8_t winusb_20_desc[WINUSB_PLATFORM_DESCRIPTOR_LENGTH] = {
     '1', 0x00, 'a', 0x00, 'd', 0x00, 'e', 0x00, '9', 0x00, '}', 0x00, 0x00, 0x00 // 78 bytes
 };
 
-#endif
-
 // current packet
 USB_Setup_TypeDef setup;
 uint8_t usbdata[0x100];
@@ -580,7 +570,7 @@ void usb_setup() {
               USB_WritePacket((uint8_t*)string_product_desc, min(sizeof(string_product_desc), setup.b.wLength.w), 0);
               break;
             case STRING_OFFSET_ISERIAL:
-              #ifdef PANDA
+              #ifdef UID_BASE
                 resp[0] = 0x02 + 12*4;
                 resp[1] = 0x03;
 
@@ -598,14 +588,12 @@ void usb_setup() {
                 USB_WritePacket((const uint8_t *)string_serial_desc, min(sizeof(string_serial_desc), setup.b.wLength.w), 0);
               #endif
               break;
-            #ifdef PANDA
             case STRING_OFFSET_ICONFIGURATION:
               USB_WritePacket((uint8_t*)string_configuration_desc, min(sizeof(string_configuration_desc), setup.b.wLength.w), 0);
               break;
             case 238:
               USB_WritePacket((uint8_t*)string_238_desc, min(sizeof(string_238_desc), setup.b.wLength.w), 0);
               break;
-            #endif
             default:
               // nothing
               USB_WritePacket(0, 0, 0);
@@ -613,12 +601,10 @@ void usb_setup() {
           }
           USBx_OUTEP(0)->DOEPCTL |= USB_OTG_DOEPCTL_CNAK;
           break;
-        #ifdef PANDA
         case USB_DESC_TYPE_BINARY_OBJECT_STORE:
           USB_WritePacket(binary_object_store_desc, min(sizeof(binary_object_store_desc), setup.b.wLength.w), 0);
           USBx_OUTEP(0)->DOEPCTL |= USB_OTG_DOEPCTL_CNAK;
           break;
-        #endif
         default:
           // nothing here?
           USB_WritePacket(0, 0, 0);
@@ -639,7 +625,6 @@ void usb_setup() {
       USB_WritePacket(0, 0, 0);
       USBx_OUTEP(0)->DOEPCTL |= USB_OTG_DOEPCTL_CNAK;
       break;
-    #ifdef PANDA
     case WEBUSB_VENDOR_CODE:
       switch (setup.b.wIndex.w) {
         case WEBUSB_REQ_GET_URL:
@@ -671,7 +656,6 @@ void usb_setup() {
           USB_WritePacket_EP0(0, 0);
       }
       break;
-    #endif
     default:
       resp_len = usb_cb_control_msg(&setup, resp, 1);
       USB_WritePacket(resp, min(resp_len, setup.b.wLength.w), 0);

board/gpio.h

@@ -1,3 +1,5 @@
+// this is last place with ifdef PANDA
+
 #ifdef STM32F4
   #include "stm32f4xx_hal_gpio_ex.h"
 #else

board/main.c

@@ -1,4 +1,4 @@
-#define EON
+//#define EON
 
 #include "config.h"
 #include "obj/gitversion.h"

board/safety.h

@@ -50,11 +50,9 @@ int controls_allowed = 0;
 #include "safety/safety_defaults.h"
 #include "safety/safety_honda.h"
 #include "safety/safety_toyota.h"
-#ifdef PANDA
 #include "safety/safety_toyota_ipas.h"
 #include "safety/safety_tesla.h"
 #include "safety/safety_gm_ascm.h"
-#endif
 #include "safety/safety_gm.h"
 #include "safety/safety_ford.h"
 #include "safety/safety_cadillac.h"
@@ -121,11 +119,9 @@ const safety_hook_config safety_hook_registry[] = {
   {SAFETY_CHRYSLER, &chrysler_hooks},
   {SAFETY_SUBARU, &subaru_hooks},
   {SAFETY_TOYOTA_NOLIMITS, &toyota_nolimits_hooks},
-#ifdef PANDA
   {SAFETY_TOYOTA_IPAS, &toyota_ipas_hooks},
   {SAFETY_GM_ASCM, &gm_ascm_hooks},
   {SAFETY_TESLA, &tesla_hooks},
-#endif
   {SAFETY_ALLOUTPUT, &alloutput_hooks},
   {SAFETY_ELM327, &elm327_hooks},
 };
@@ -225,7 +221,6 @@ int rt_rate_limit_check(int val, int val_last, const int MAX_RT_DELTA) {
 }
 
 
-#ifdef PANDA
 // interp function that holds extreme values
 float interpolate(struct lookup_t xy, float x) {
   int size = sizeof(xy.x) / sizeof(xy.x[0]);
@@ -250,4 +245,3 @@ float interpolate(struct lookup_t xy, float x) {
     return xy.y[size - 1];
   }
 }
-#endif

board/spi_flasher.h

@@ -48,16 +48,14 @@ int usb_cb_control_msg(USB_Setup_TypeDef *setup, uint8_t *resp, int hardwired) {
       break;
     // **** 0xd0: fetch serial number
     case 0xd0:
-      #ifdef PANDA
-        // addresses are OTP
-        if (setup->b.wValue.w == 1) {
-          memcpy(resp, (void *)0x1fff79c0, 0x10);
-          resp_len = 0x10;
-        } else {
-          get_provision_chunk(resp);
-          resp_len = PROVISION_CHUNK_LEN;
-        }
-      #endif
+      // addresses are OTP
+      if (setup->b.wValue.w == 1) {
+        memcpy(resp, (void *)0x1fff79c0, 0x10);
+        resp_len = 0x10;
+      } else {
+        get_provision_chunk(resp);
+        resp_len = PROVISION_CHUNK_LEN;
+      }
       break;
     // **** 0xd1: enter bootloader mode
     case 0xd1: