Rolled back vscp_firmware.c/h from some happy hacking ;-) @svenZ80

grodansparadis · Nov 25, 2015 · 3bae432 · 3bae432 · svenZ80 · Nov 25, 2015
1 parent 6a15eb6
commit 3bae432
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/common/vscp_firmware.c b/common/vscp_firmware.c
@@ -686,8 +686,7 @@ uint8_t vscp_readStdReg(uint8_t reg)
     else if ( reg >= VSCP_REG_DEVICE_URL ) {
 
         // * * * The device URL * * *
-        rv = vscp_getMDF_URL(reg - VSCP_REG_DEVICE_URL);
-
+        rv = vscp_getMDF_URL(reg - VSCP_REG_DEVICE_URL);	
 
     }
 
@@ -1212,18 +1211,7 @@ void vscp_handleProtocolEvent(void)
 
 					// send the event
 					vscp_sendEvent();
-
-					//add some delay so zvr/bus/converter/daemon buffer can handle the traffic
-					// 1400 NOP for 16Mhz crystal
-					//todo check if message is sent before next sendevent is called, thus nu delay necessary
-					unsigned int i =0;
-					 for (i =0; i<1400; i++)
-					 {
-						__asm__ __volatile__ ("nop");
-
-					 }
-
-
+
 					// increment byte by bytes_this_time and the event number by one
 					byte += bytes_this_time;
 

diff --git a/common/vscp_firmware.h b/common/vscp_firmware.h
@@ -641,7 +641,7 @@ void vscp_getEmbeddedMdfInfo(void);
     This routine force the system into boot loader mode according
     to the selected protocol.
  */
-//void vscp_goBootloaderMode( uint8_t algorithm );
+void vscp_goBootloaderMode( uint8_t algorithm );
 
 /*!
     Get Zone for device