Small fixes for logs

sw/src/gpio.cpp

@@ -22,12 +22,12 @@ bool gpioInit(void){
     pinMode(BOARD_SCSI_TERM_LOW, OUTPUT);
     pinMode(BOARD_SCSI_DBX, OUTPUT);
     pinMode(BOARD_SCSI_TERM_POWER, INPUT); //Check if external termination power is provided
-
-    //attachInterrupt(BOARD_SDCARD_INSERT,sdCardInsert, CHANGE);
-    //attachInterrupt(BOARD_SWITCH1_PIN,switchImage, CHANGE);
-    //attachInterrupt(BOARD_SWITCH2_PIN,switchImage, CHANGE);
-    //attachInterrupt(BOARD_SWITCH3_PIN,switchImage, CHANGE);
-    //attachInterrupt(BOARD_SWITCH4_PIN,switchImage, CHANGE);
+    
+    attachInterrupt(BOARD_SDCARD_INSERT,sdCardInsert, CHANGE);
+    attachInterrupt(BOARD_SWITCH1_PIN,switchImage, CHANGE);
+    attachInterrupt(BOARD_SWITCH2_PIN,switchImage, CHANGE);
+    attachInterrupt(BOARD_SWITCH3_PIN,switchImage, CHANGE);
+    attachInterrupt(BOARD_SWITCH4_PIN,switchImage, CHANGE);
 
     // Control SCSI drivers
     pinMode(BOARD_SCSI_DTD, OUTPUT);
@@ -35,7 +35,7 @@ bool gpioInit(void){
     pinMode(BOARD_SCSI_TAD, OUTPUT);
     pinMode(BOARD_TRANS_OE, OUTPUT);
     digitalWrite(BOARD_SCSI_TERM_HIGH, LOW);
-    digitalWrite(BOARD_SCSI_TERM_LOW, LOW);
+    digitalWrite(BOARD_SCSI_TERM_LOW, HIGH);
     digitalWrite(BOARD_TRANS_OE, LOW);
     SCSI_SET_PULL() ;
     TRANSCEIVER_IO_SET(vDTD,DB_INPUT);

sw/src/log.cpp

@@ -6,6 +6,7 @@ extern SdFs SD;
 extern ArduinoOutStream cout(Serial);
 extern HDDIMG  img[NUM_SCSIID][NUM_SCSILUN]; 
 extern SCSI_DEVICE scsi_device_list[NUM_SCSIID][NUM_SCSILUN];
+extern uint32_t board_revsion;
 /*
  * Setup initialization logfile
  */
@@ -16,8 +17,10 @@ extern SCSI_DEVICE scsi_device_list[NUM_SCSIID][NUM_SCSILUN];
 void initFileLog(int success_mhz) {
   LOG_FILE = SD.open(LOG_FILENAME, O_WRONLY | O_CREAT | O_TRUNC);
   LOG_FILE.println("BlackSASI <-> SD");
-  LOG_FILE.print("VERSION: ");
+  LOG_FILE.print("SW VERSION: ");
   LOG_FILE.println(VERSION);
+  LOG_FILE.print("HW VERSION: ");
+  LOG_FILE.println(board_revsion);
   LOG_FILE.print("DEBUG:");
   LOG_FILE.print(DEBUG);
   LOG_FILE.print(" SDFAT_FILE_TYPE:");

sw/src/main.cpp

@@ -69,6 +69,7 @@ FsFile LOG_FILE;
 
 volatile bool m_isBusReset = false;   // Bus reset
 volatile bool m_resetJmp = false;     // Call longjmp on reset
+volatile uint32_t board_revsion;
 jmp_buf       m_resetJmpBuf;
 
 byte          scsi_id_mask;              // Mask list of responding SCSI IDs
@@ -291,6 +292,10 @@ void setup()
   //while (!Serial);
 #endif
   gpioInit();
+  board_revsion =  (digitalRead(BOARD_REV_PIN0) == HIGH) | 
+                   (digitalRead(BOARD_REV_PIN1) == HIGH) << 1 | 
+                   (digitalRead(BOARD_REV_PIN2) ==  HIGH) << 2;
+
   // Default all SCSI command handlers to onUnimplemented
   for(unsigned i = 0; i < MAX_SCSI_COMMAND; i++)
   {
@@ -360,7 +365,6 @@ void setup()
                         ((digitalRead(BOARD_SWITCH3_PIN) == LOW) ) << 2 | 
                         ((digitalRead(BOARD_SWITCH4_PIN) == LOW) ) << 3;
 
-  
   TRANSCEIVER_IO_SET(vIND,TR_INPUT);
   TRANSCEIVER_IO_SET(vTAD,TR_INPUT);
   TERMINATION_LOW();
@@ -559,7 +563,7 @@ void findDriveImages(FsFile root) {
               break;
           }
 
-          //readSCSIDeviceConfig(dev);
+          readSCSIDeviceConfig(dev);
         }
       }      
     }

sw/src/sdcard.cpp

@@ -3,7 +3,7 @@ extern SdFs SD;
 extern FsFile LOG_FILE;
 extern uint16_t imageSelect;
 // read SD information and print to logfile
-void readSDCardInfo2()
+void readSDCardInfo()
 {
   cid_t sd_cid;
 
@@ -32,7 +32,7 @@ void readSDCardInfo2()
 
   }
 }
-void readSDCardInfo()
+void readSDCardInfo2()
 {
   cid_t sd_cid;