Add dragon support (#128)

Add dragon support to config. Add makefile, change call vector to dragon
drivewire call.  Support VDK file mounting.  Add reminder message for drive
mounting.

Author: wdathing

Makefile.dragon

@@ -0,0 +1,107 @@
+# Makefile for Building CoCo Config with CMOC
+
+CC=cmoc
+AS=lwasm
+CP=cp
+MV=mv
+CFLAGS=-c --dragon -DDRAGON -O2 --no-relocate
+ECHO=echo
+FIRMWARE_DIR="../fujinet-firmware"
+
+all: configd.bin configx.bin
+
+CONFIGOBJS = check_wifi.o connect_wifi.o destination_host_slot.o hosts_and_devices.o main.o perform_copy.o select_file.o select_slot.o set_wifi.o show_info.o bar.o die.o input.o io.o mount_and_boot.o screen.o strrchr.o pause.o
+
+
+#HIRESLIB = src/coco/hirestxt-0.5.0/libhirestxt_dgn.a 
+
+configd.bin: $(CONFIGOBJS)
+	$(CC) --dragon --org=2601 --limit=7800 -O2 --no-relocate -o configd.bin  $(CONFIGOBJS) 
+	#$(CC) --dragon --raw -o configd.bin  $(HIRESLIB) $(CONFIGOBJS) 
+	$(ECHO) Now, Do a Upload Filesystem task.
+	rm -f autorund.vdk
+	dragondos new autorund.vdk 360 
+	dragondos list autorund.vdk
+	#for i in $^; do  dragondos insertbinary ./autorund.vdk $$i 0x2601 0x2601; done
+	dragondos insertbinary ./autorund.vdk ./configd.bin 0x2601 0x2601
+	dragondos list autorund.vdk
+	$(CP) autorund.vdk ~/tnfs/	
+	$(CP) autorund.vdk ../fujinet-firmware/data/webui/device_specific/BUILD_COCO/
+	$(CP) autorund.vdk ../fujinet-firmware/data/BUILD_COCO/
+	$(CP) configd.bin AUTOLOAD.DWL
+	$(CP) AUTOLOAD.DWL ../fujinet-firmware/data/BUILD_COCO/
+	$(CP) AUTOLOAD.DWL ../fujinet-firmware/data/webui/device_specific/BUILD_COCO/
+
+	$(ECHO) Now, Do a Upload Filesystem task.
+
+# One option for autoload is to just create the config file as a dragon binary and load this with the DW4 named object mechanism
+#
+configx.bin:  check_wifi.o connect_wifi.o destination_host_slot.o hosts_and_devices.o main.o perform_copy.o select_file.o select_slot.o set_wifi.o show_info.o bar.o die.o input.o io.o mount_and_boot.o screen.o strrchr.o pause.o
+	$(CC) --verbose -O2 --dragon -o configx.bin $(HIRESLIB) check_wifi.o connect_wifi.o destination_host_slot.o hosts_and_devices.o main.o perform_copy.o select_file.o select_slot.o set_wifi.o show_info.o bar.o die.o input.o io.o mount_and_boot.o screen.o strrchr.o pause.o
+#	--org=2601 --limit=7800 
+#	$(CP) configx.bin AUTOLOAD.DWL
+#	$(CP) AUTOLOAD.DWL ../original/data/BUILD_COCO/AUTOLOAD.DWL
+#	$(CP) AUTOLOAD.DWL ../original/data/webui/device_specific/BUILD_COCO/AUTOLOAD.DWL
+
+pause.o: src/coco/pause.c
+	$(CC) $(CFLAGS) src/coco/pause.c
+
+strrchr.o: src/coco/strrchr.c
+	$(CC) $(CFLAGS) src/coco/strrchr.c
+
+check_wifi.o: src/check_wifi.c
+	$(CC) $(CFLAGS) src/check_wifi.c
+
+connect_wifi.o: src/connect_wifi.c
+	$(CC) $(CFLAGS) src/connect_wifi.c
+
+destination_host_slot.o: src/destination_host_slot.c
+	$(CC) $(CFLAGS) src/destination_host_slot.c
+
+hosts_and_devices.o: src/hosts_and_devices.c
+	$(CC) $(CFLAGS) src/hosts_and_devices.c
+
+main.o: src/main.c
+	$(CC) $(CFLAGS) src/main.c
+
+perform_copy.o: src/perform_copy.c
+	$(CC) $(CFLAGS) src/perform_copy.c
+
+select_file.o: src/select_file.c
+	$(CC) $(CFLAGS) src/select_file.c
+
+select_slot.o: src/select_slot.c
+	$(CC) $(CFLAGS) src/select_slot.c
+
+set_wifi.o: src/set_wifi.c
+	$(CC) $(CFLAGS) src/set_wifi.c
+
+show_info.o: src/show_info.c
+	$(CC) $(CFLAGS) src/show_info.c
+
+bar.o: src/coco/bar.c
+	$(CC) $(CFLAGS) src/coco/bar.c
+
+die.o: src/coco/die.c
+	$(CC) $(CFLAGS) src/coco/die.c
+
+input.o: src/coco/input.c
+	$(CC) $(CFLAGS) src/coco/input.c
+
+io.o: src/coco/io.c
+	$(CC) $(CFLAGS) src/coco/io.c
+
+mount_and_boot.o: src/coco/mount_and_boot.c
+	$(CC) $(CFLAGS) src/coco/mount_and_boot.c
+
+screen.o: src/coco/screen.c
+	$(CC) $(CFLAGS) src/coco/screen.c
+
+clean:
+	$(RM) *.o
+	$(RM) coco/*.o
+	$(RM) config.bin
+	$(RM) autorund.vdk
+	$(RM) AUTOLOAD.DWL
+
+

src/coco/io.c

@@ -23,6 +23,15 @@ byte response[256];
 int _dirpos=0;
 byte orig_casflag;
 
+#ifndef DRAGON
+#define DWWRT_VEC 0xD941
+#define DWREAD_VEC 0xD93F
+#else
+#define DWWRT_VEC 0xFA00
+#define DWREAD_VEC 0xF9FE
+#endif
+
+
 /**
  * @brief Read string to s from DriveWire with expected length l
  * @param s pointer to string buffer
@@ -33,10 +42,11 @@ byte dwread(byte *s, int l)
 {
   asm
     {
+    orcc  #$50
     pshs x,y
     ldx :s
     ldy :l
-    jsr [0xD93F]
+    jsr [DWREAD_VEC]
     puls y,x
     tfr cc,b
     lsrb
@@ -55,12 +65,13 @@ int dwwrite(byte *s, int l)
 {
   asm
     {
+        orcc  #$50
         pshs x,y
         ldx :s
-	ldy :l
-        jsr [0xD941]
-	tfr cc,d
-	puls y,x
+	    ldy :l
+        jsr [DWWRT_VEC]
+	    tfr cc,d
+	    puls y,x
     }
 }
 
@@ -174,7 +185,7 @@ unsigned char io_get_wifi_status(void)
 
   io_ready();
   io_get_response(&r, 1);
-    
+
   return r;
 }
 
@@ -458,6 +469,10 @@ void io_mount_disk_image(unsigned char ds, unsigned char mode)
     dwwrite((byte *)"\xE2\xF8",2);
     dwwrite((byte *)&ds,1);
     dwwrite((byte *)&mode,1);
+
+#ifdef DRAGON
+
+#endif
 }
 
 void io_umount_disk_image(unsigned char ds)

src/coco/pause.c

@@ -9,7 +9,21 @@
 
 void pause(unsigned char delay)
 {
-  sleep(delay/60);
+#ifdef DRAGON  
+asm
+{
+    // We come here from a JMP $C000 in Color Basic (normally at
+    // $A10A in v1.2). At this point, the 60 Hz interrupt has
+    // not been enabled yet, so enable it.
+    lda     $FF03   // get control register of PIA0, port B
+    ora     #1
+    sta     $FF03   // enable 60 Hz interrupt
+
+    // Unmask interrupts to allow the timer IRQ to be processed.
+    andcc   #$AF
+}
+#endif
+  sleep(delay/20);
 }
 
 #endif /* _CMOC_VERSION */

src/connect_wifi.c

@@ -79,7 +79,11 @@ extern bool screen_should_be_cleared;
 
 void connect_wifi(void)
 {
+#ifndef _CMOC_VERSION_
 	unsigned char retries = 20;
+#else
+	unsigned char retries = 2;
+#endif
 	NetConfig nc;
 	unsigned char s, key;
 
@@ -95,14 +99,24 @@ void connect_wifi(void)
 #ifndef _CMOC_VERSION_
 	  // check for esc key and abort
 		if (input() == KEY_ABORT)
+#else
+		unsigned char c = inkey();
+		if (c!=0) 
+		{
+			char szMsg[32];
+			sprintf(szMsg, "c = %02x\n", c);
+			screen_error(szMsg);
+			pause(150);
+		}
+		if (c==' ' || c==0x3)
+#endif /* _CMOC_VERSION_ */
 		{
 			screen_error("CONNECTION ABORTED");
 			pause(150);
-			state=SET_WIFI;
+			state=HOSTS_AND_DEVICES;
 			return;
 		}
-#endif /* _CMOC_VERSION_ */
-		
+
 		s = io_get_wifi_status();
 
 		switch (s)
@@ -120,13 +134,23 @@ void connect_wifi(void)
 			pause(60);
 			return;
 		case 4:
-			screen_error("CONNECT FAILED");
-			pause(150);
+			screen_error("CONNECT FAILED1");
+			//pause(150);
+			// ws_subState = WS_SCAN;
+			state = HOSTS_AND_DEVICES;
 			return;
 		case 5:
 			screen_error("CONNECTION LOST");
 			pause(150);
 			return;
+#ifdef _CMOC_VERSION_			
+		case 6:
+			//screen_error("CONNECT FAILED");
+			screen_error("BAD PSK");
+			pause(150);
+			state = HOSTS_AND_DEVICES;
+			return;
+#endif			
 		default:
 			screen_error("PLEASE WAIT...");
  			pause(150);

src/hosts_and_devices.c

@@ -359,7 +359,9 @@ void hosts_and_devices_done(void)
       io_mount_disk_image(i, deviceSlots[i].mode);
     }
   }
-
+#ifdef DRAGON
+  printf("DON'T FORGET TO MAP DISKS\n I.E. \"LINK 1,5\"");
+#endif
   state = DONE;
 }