X-Git-Url: https://git.donarmstrong.com/?p=kiibohd-controller.git;a=blobdiff_plain;f=Output%2FpjrcUSB%2Farm%2Fusb_dev.c;h=1f2e725868aadd1d25f89dd9b5dff3cff62ea81d;hp=f09540c086efaf893d46191e73a13aa27b1040ef;hb=55d03f448e42ea581810bef3d55eb9c017572665;hpb=6c67bc77bc0c42ae8a67d6bbe6abce8de235de56

diff --git a/Output/pjrcUSB/arm/usb_dev.c b/Output/pjrcUSB/arm/usb_dev.c
index f09540c..1f2e725 100644
--- a/Output/pjrcUSB/arm/usb_dev.c
+++ b/Output/pjrcUSB/arm/usb_dev.c
@@ -1,7 +1,7 @@
 /* Teensyduino Core Library
  * http://www.pjrc.com/teensy/
  * Copyright (c) 2013 PJRC.COM, LLC.
- * Modifications by Jacob Alexander (2013-2014)
+ * Modifications by Jacob Alexander (2013-2015)
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -204,6 +204,7 @@ static void usb_setup()
 		print("CONFIGURE - ");
 		#endif
 		usb_configuration = setup.wValue;
+		Output_Available = usb_configuration;
 		reg = &USB0_ENDPT1;
 		cfg = usb_endpoint_config_table;
 		// clear all BDT entries, free any allocated memory...
@@ -861,6 +862,13 @@ void usb_device_reload()
 		SOFTWARE_RESET();
 	}
 
+// Kiibohd mk20dx256vlh7
+#elif defined(_mk20dx256vlh7_)
+	// Copies variable into the VBAT register, must be identical to the variable in the bootloader to jump to the bootloader flash mode
+	for ( int pos = 0; pos < sizeof(sys_reset_to_loader_magic); pos++ )
+		(&VBAT)[ pos ] = sys_reset_to_loader_magic[ pos ];
+	SOFTWARE_RESET();
+
 // Teensy 3.0 and 3.1
 #else
 	asm volatile("bkpt");
@@ -1118,11 +1126,6 @@ uint8_t usb_init()
 	print("USB INIT"NL);
 	#endif
 
-	// If no USB cable is attached, do not initialize usb
-	// XXX Test -HaaTa
-	//if ( USB0_OTGISTAT & USB_OTGSTAT_ID )
-	//      return 0;
-
 	// Clear out endpoints table
 	for ( int i = 0; i <= NUM_ENDPOINTS * 4; i++ )
 	{