MEGA65 banner now displays internal device numbers

src/,,config_mega65.s

@@ -33,8 +33,6 @@
 ;; #CONFIG# IEC_JIFFYDOS_BLANK         NO
 ;; #CONFIG# IEC_BURST_M65              NO        ; please keep disabled for now
 
-;; #CONFIG# UNIT_SDCARD                20        ; do not change for now
-
 
 ; --- Tape deck configuration
 
@@ -93,7 +91,7 @@
 
 ; --- Built-in DOS configuration
 
-;; #CONFIG# UNIT_SDCARD                0         ; do not change, DOS is not implemented yet
+;; #CONFIG# UNIT_SDCARD                20        ; do not change, DOS is not implemented yet
 ;; #CONFIG# UNIT_FLOPPY                0         ; do not change, DOS is not implemented yet
 ;; #CONFIG# UNIT_RAMDISK               0         ; do not change, DOS is not implemented yet
 

src/basic/,imports.s

@@ -50,6 +50,8 @@
 ;; #ALIAS# m65_shadow_BZP      = KERNAL_0.m65_shadow_BZP
 ;; #ALIAS# proxy_M1_IO_end     = KERNAL_0.proxy_M1_IO_end
 
+;; #ALIAS# m65dos_unitnum      = KERNAL_0.m65dos_unitnum
+
 ;
 ; Ultimate 64 specific parts
 ;

src/basic/basic_commands_04/cmd_sysinfo.s

@@ -106,12 +106,46 @@ print_sysinfo_video:
 @5:
 	jsr print_packed_misc_str
 
-	; Print build featires information
+	; Print build features information
 
 	ldx #IDX__STR_SI_FEATURES
-	jmp print_packed_misc_str
+	jsr print_packed_misc_str
 
+	; Print SD CARD unit ID
 
+	lda #$00
+	jsr cmd_sysinfo_print_dev
+
+	ldx #IDX__STR_DOS_FD
+	jsr print_packed_misc_str
+
+	; Print floppy unit ID
+
+	lda #$01
+	jsr cmd_sysinfo_print_dev
+
+	; Print ram disk unit ID
+
+	ldx #IDX__STR_DOS_RD
+	jsr print_packed_misc_str
+
+	lda #$02
+	jsr cmd_sysinfo_print_dev
+
+	jmp print_return
+
+cmd_sysinfo_print_dev:
+
+	jsr m65dos_unitnum
+	bcs @nounit
+	tax
+	lda #$00
+	jmp print_integer
+
+@nounit:
+
+	lda #'-'
+	jmp JCHROUT
 
 cmd_sysinfo_hw_ids:
 

src/basic/board_m65/mega65_imports.s

@@ -46,3 +46,4 @@
 ;; #ALIAS# fetch_character_skip_spaces     = BASIC_0.proxy_B1_fetch_character_skip_spaces
 ;; #ALIAS# fetch_uint8                     = BASIC_0.proxy_B1_fetch_uint8
 ;; #ALIAS# shell_main_loop                 = BASIC_0.proxy_B1_shell_main_loop
+;; #ALIAS# m65dos_unitnum                  = BASIC_0.proxy_B1_m65dos_unitnum

src/basic/board_m65/mega65_proxies.s

@@ -156,3 +156,9 @@ proxy_M1_print_kernal_error:
 	jsr do_error_print_only
 	jmp proxy_M1_IO_end
 }
+
+proxy_B1_m65dos_unitnum:
+
+	jsr map_NORMAL
+	jsr m65dos_unitnum
+	bra proxy_B1_end_2

src/basic/init/initmsg_m65.s

@@ -31,11 +31,11 @@ INITMSG_native:
 
 	; Native mode	
 
-	ldx #48
+	ldx #44
 	ldy #0
 	jsr M65_SETWIN_XY
 
-	ldx #32
+	ldx #36
 	ldy #9
 	jsr M65_SETWIN_WH
 

src/dos_m65/,aliases_dos.s

@@ -3,7 +3,6 @@
 ;
 
 ; NOTES:
-; - DOS zeropage is mirrored at $8000
 ; - starting from $8000, 16KB RAM is available (starting from $10000 in C65 address space)
 ; - additional 16KB RAM is reserved for DOS too ($14000-$17FFF), and can be banked-in if needed
 
@@ -13,14 +12,14 @@
 	; Page 0
 	;
 
-	!addr MAGICSTR         = $00 ; magic string; if not matching, DOS considered non-functional
+	!addr MAGICSTR         = $8000 ; magic string; if not matching, DOS considered non-functional
 
 	; General DOS configuration
 
-	!addr UNIT_SDCARD      = $05
+	!addr UNIT_SDCARD      = $8005
-	!addr UNIT_FLOPPY      = $06
+	!addr UNIT_FLOPPY      = $8006
-	!addr UNIT_RAMDISK     = $07
+	!addr UNIT_RAMDISK     = $8007
 
 	; General DOS status
 
-	!addr UNIT_HANDLER     = $08
+	!addr UNIT_HANDLER     = $8008

src/dos_m65/dos_unitnum.s

@@ -20,30 +20,31 @@ dos_UNITNUM:
 	cmp #$02
 	beq dos_UNITNUM_ramdisk
 
-	lda #$00
-
 	; FALLTROUGH
 
 dos_UNITNUM_none:
 
+	lda #$00
+
 	sec
 	rts
 
 dos_UNITNUM_sdcard:
 
 	lda UNIT_SDCARD
-
+	bra dos_UNITNUM_common
-	+skip_2_bytes_trash_nvz
 
 dos_UNITNUM_floppy:
 
 	lda UNIT_FLOPPY
-
+	bra dos_UNITNUM_common
-	+skip_2_bytes_trash_nvz
 
 dos_UNITNUM_ramdisk:
 
 	lda UNIT_RAMDISK
+	bra dos_UNITNUM_common
+
+dos_UNITNUM_common:
 
 	cmp #$00
 	beq dos_UNITNUM_none

src/kernal/board_m65/mega65_map_helpers.s

@@ -76,12 +76,8 @@ map_DOS_1:
 	phy
 	phz
 
-	lda #$80
-	tab                      ; from now on, zeropage starts from $C000
-
 	ldy #$80
-	lda #$30
+	ldz #$30                 ; $8000 <- map 16KB RAM from $10000
-	taz                      ; $8000 <- map 16KB RAM from $10000
 
 	lda #$C0
 	ldx #$C1                 ; $4000 <- map 16KB ROM from $20000
@@ -89,19 +85,6 @@ map_DOS_1:
 	map
 	bra map_end_no_eom       ; no EOM, we do not want interrupts within DOS!
 
-map_NORMAL_from_DOS_1:
-
-	php
-	pha
-	phx
-	phy
-	phz
-
-	lda #$00
-	tab
-
-	bra map_NORMAL_common
-
 map_MON_1:
 
 	php

src/kernal/iec_fast/m65dos_bridge.s

@@ -67,7 +67,7 @@ m65dos_acptr:
 
 m65dos_end_1:
 
-	jmp map_NORMAL_from_DOS_1          ; ACPTR is slightly faster
+	jmp map_NORMAL                    ; ACPTR is slightly faster
 
 m65dos_ciout:
 
@@ -78,7 +78,7 @@ m65dos_ciout:
 
 m65dos_end_2:
 
-	jmp map_NORMAL_from_DOS_1          ; CIOUT is slightly faster
+	jmp map_NORMAL                    ; CIOUT is slightly faster
 
 m65dos_listen:
 

tools/generate_strings.cc

@@ -306,6 +306,9 @@ const StringEntryList GLOBAL_MiscStrings =  { ListType::STRINGS_BASIC, "misc",
     { false, true,  true,  false, false, "STR_MEM_STRS",     "\r STRS"            },
     { false, true,  true,  false, false, "STR_MEM_FREE",     "\r\r FREE"          },
 
+    { false, false, true,  false, false, "STR_DOS_FD",       ", FDD "             },
+    { false, false, true,  false, false, "STR_DOS_RD",       ", RAM "             },
+
     { false, false, true,  false, false, "STR_SI_HEADER",    "OPEN ROMS, "        },
     { false, false, true,  false, false, "STR_SI_MODE64",    "LEGACY MODE"        },
     { false, false, true,  false, false, "STR_SI_MODE65",    "NATIVE MODE"        },
@@ -1221,7 +1224,7 @@ void DataSet::generateConfigDepStrings()
 
     // CBDOS features
 
-    featureStrM65 += "CBDOS  : NO FDD/SD/RAM SUPPORT\r";
+    featureStrM65 += "CBDOS  : CARD ";
 
     // Keyboard support features