WebSVN – HomeAutomation – Diff – /trunk/EmbeddedSoftware/AVR/avr-lib/bios/bios.c

 /*
- * $Id: bios.c 585 2007-08-06 17:44:46Z arune $
+ * $Id: bios.c 769 2008-04-28 20:34:34Z arune $
  */
 #include <inttypes.h>
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <vectors.h> // Must be included after sfr_defs.h but before any ISR()
 #include <drivers/can/can.h>
 #include <flash.h>
 #include <bios_export.h>
 #include CAN_DRIVER_H
+#if !defined( NODE_HW_ID )
+#error No NODE_HW_ID in bios.inc, set NODE_HW_ID=<GENERATE_HW> and Ill generate it for you
+#endif
 #if defined(__AVR_ATmega8__)
 #define IVSEL_REG GICR
 #elif defined(__AVR_ATmega88__) || defined(__AVR_ATmega168__)
 #define IVSEL_REG MCUCR
 #endif
 #if defined(AUTOSTART)
 #if AUTOSTART == 0
 #error Please choose a higher AUTOSTART value in bios.inc, the nod will cease to work, and you can only reflash node with ISP
 #endif
 #if AUTOSTART == 1
 #error Please choose a higher AUTOSTART value in bios.inc, there might be problems with updating software on node
 #endif
 #endif
 //---------------------------------------------------------------------------
 // Private declarations
 volatile uint8_t bios_msg_full;
 Can_Message_t* bios_msg_ptr; // only a pointer to main-local structure to save .bss space
 extern void __bios_start; // Start of BIOS area in flash, from ld-script.
+prog_uint32_t hwid = NODE_HW_ID;
 #if defined(AUTOSTART)
 uint8_t autostart_cnt;
 #endif
-#define BIOS_APP    1
+#define BIOS_APP        1
-#define BIOS_NOAPP  2
+#define BIOS_NOAPP      2
-#define BIOS_PGM    3
+#define BIOS_PGM        3
+#define BIOS_END_PGM    4
 //---------------------------------------------------------------------------
 // Private functions
 void Can_Process(Can_Message_t* msg) {
             // or the master node is not up, the node will be reset.
             wdt_reset();
             //TODO: Don't care about time right now... Figure out what to do with it.
 #if defined(AUTOSTART)
             autostart_cnt++;
 #endif
         }
-        if ((msg->Id & CAN_MASK_NMT_RID)>>CAN_SHIFT_NMT_RID == NODE_ID) {
+        if (((msg->Id & CAN_MASK_NMT_TYPE)>>CAN_SHIFT_NMT_TYPE) == CAN_NMT_RESET && msg->DataLength == 4 &&
-            if ((msg->Id & CAN_MASK_NMT_TYPE)>>CAN_SHIFT_NMT_TYPE == CAN_NMT_RESET) {
+                msg->Data.bytes[0] == (hwid&0xff) && msg->Data.bytes[1] == ((hwid>>8)&0xff) &&
+                msg->Data.bytes[2] == ((hwid>>16)&0xff) && msg->Data.bytes[3] == ((hwid>>24)&0xff) ) {
-                BIOS_Reset();
+            BIOS_Reset();
+        }
-            // Copy message to bios buffer if bios is done with the previous message.
+        // Copy message to bios buffer if bios is done with the previous message.
-            // This is also a check to see if bios is still running. When app is
+        // This is also a check to see if bios is still running. When app is
-            // started, bios_msg_full is never reset to 0 so the check fails and all
+        // started, bios_msg_full is never reset to 0 so the check fails and all
-            // NMT communication except reset is ignored.
+        // NMT communication except reset is ignored.
-            if (!(bios_msg_full)) {
+        if (!(bios_msg_full)) {
-                memcpy(bios_msg_ptr, msg, sizeof(Can_Message_t));
+            memcpy(bios_msg_ptr, msg, sizeof(Can_Message_t));
-                bios_msg_full = 1;
+            bios_msg_full = 1;
-            }
+        }
     } else if (BIOS_CanCallback) {
         //printf("Calling app callback.\n");
         BIOS_CanCallback(msg);
+    }
     if (Can_Init() != CAN_OK) BIOS_Reset();
     tx_msg.RemoteFlag = 0;
     tx_msg.ExtendedFlag = 1;
     tx_msg.Id = CAN_ID_NMT_BIOS_START;
-    tx_msg.DataLength = 3;
+    tx_msg.DataLength = 8;
-    tx_msg.Data.words[0] = BIOS_VERSION;
+    tx_msg.Data.bytes[0] = BIOS_VERSION&0xff;
+    tx_msg.Data.bytes[1] = (BIOS_VERSION>>8)&0xff;
+    tx_msg.Data.bytes[4] = hwid&0xff;
+    tx_msg.Data.bytes[5] = (hwid>>8)&0xff;
+    tx_msg.Data.bytes[6] = (hwid>>16)&0xff;
+    tx_msg.Data.bytes[7] = (hwid>>24)&0xff;
     if (pgm_read_word(0) == 0xffff) {
         // No application in flash
         // Send CAN_NMT_BIOS_START(BIOS_VERSION, 0)
         tx_msg.Data.bytes[2] = 0;
         nmt_type = (bios_msg.Id & CAN_MASK_NMT_TYPE)>>CAN_SHIFT_NMT_TYPE;
         switch (bios_state) {
         case BIOS_APP:
-            if (nmt_type == CAN_NMT_START_APP) {
+            //if (nmt_type == CAN_NMT_START_APP) {
+            if (nmt_type == CAN_NMT_START_APP && bios_msg.DataLength == 4 &&
+                    bios_msg.Data.bytes[0] == (hwid&0xff) && bios_msg.Data.bytes[1] == ((hwid>>8)&0xff) &&
+                    bios_msg.Data.bytes[2] == ((hwid>>16)&0xff) && bios_msg.Data.bytes[3] == ((hwid>>24)&0xff) ) {
                 app_reset(); // Will never return
+            }
             // Fall through
         case BIOS_NOAPP:
-            if (nmt_type == CAN_NMT_PGM_START) {
+            //if (nmt_type == CAN_NMT_PGM_START) {
+            if (nmt_type == CAN_NMT_PGM_START && bios_msg.DataLength == 8 &&
+                    bios_msg.Data.bytes[4] == (hwid&0xff) && bios_msg.Data.bytes[5] == ((hwid>>8)&0xff) &&
+                    bios_msg.Data.bytes[6] == ((hwid>>16)&0xff) && bios_msg.Data.bytes[7] == ((hwid>>24)&0xff) ) {
                 // Set base address
                 base_addr = bios_msg.Data.words[0];
                 flash_init(pagebuf);
                 //send CAN_NMT_PGM_ACK(offset)
                 tx_msg.Id = CAN_ID_NMT_PGM_ACK;
                 tx_msg.Data.words[0] = base_addr;
                 send_msg = 1;
                 bios_state = BIOS_PGM;
-            }
-            if (nmt_type == CAN_NMT_PGM_COPY) {
-                // For BIOS updating over CAN. Upload bios to application area,
-                // send this message with correct parameters to copy data from
-                // application to bios area and pray it will come alive again.
-                flash_copy_data(bios_msg.Data.words[0],
-                                bios_msg.Data.words[1],
-                                bios_msg.Data.words[2]);
-                // flash_copy_data will never return.
+            }
             break;
         case BIOS_PGM:
             // Default to send CAN_NMT_PGM_ACK(offset)
             tx_msg.Id = CAN_ID_NMT_PGM_ACK;
                     crc = _crc16_update(crc, pgm_read_byte(loc));
+                }
                 tx_msg.Data.words[0] = crc;
                 send_msg = 1;
-                bios_state = BIOS_NOAPP;
+                bios_state = BIOS_END_PGM;
+            }
+            break;
+        case BIOS_END_PGM:
+            if (nmt_type == CAN_NMT_PGM_COPY) {
+                // For BIOS updating over CAN. Upload bios to application area,
+                // send this message with correct parameters to copy data from
+                // application to bios area and pray it will come alive again.
+                flash_copy_data(bios_msg.Data.words[0],
+                                bios_msg.Data.words[1],
+                                bios_msg.Data.words[2]);
+                // flash_copy_data will never return.
+            }
+        }
         if (send_msg) {
             while (Can_Send(&tx_msg) != CAN_OK);

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/avr-lib/bios/bios.c @ 1663 – Rev 585 → 769