From d7e5a445a9fcdf1c507f9af63dc74dbd3cb42463 Mon Sep 17 00:00:00 2001
From: b1ackmai1er <difficultylevelhigh@gmail.com>
Date: Mon, 7 Dec 2020 06:28:23 +0800
Subject: [PATCH] Revert new media id

---
 Source/Doc/Architecture.md |  1 -
 Source/HBIOS/hbios.inc     |  1 -
 Source/HBIOS/md.asm        | 15 ++++++---------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Source/Doc/Architecture.md b/Source/Doc/Architecture.md
index 572b7838..cad546bd 100644
--- a/Source/Doc/Architecture.md
+++ b/Source/Doc/Architecture.md
@@ -608,7 +608,6 @@ MID\_FD360   | 7         | 5.25" 360K Floppy
 MID\_FD120   | 8         | 5.25" 1.2M Floppy
 MID\_FD111   | 9         | 8" 1.11M Floppy
 MID\_HDNEW   | 10        | Hard Disk with 1024 Directory entries
-MID\_MDFSH   | 11        | FLASH Drive
 
 ### Function 0x10 -- Disk Status (DIOSTATUS)
 
diff --git a/Source/HBIOS/hbios.inc b/Source/HBIOS/hbios.inc
index 95f08bf8..2457bc9c 100644
--- a/Source/HBIOS/hbios.inc
+++ b/Source/HBIOS/hbios.inc
@@ -148,7 +148,6 @@ MID_FD360	.EQU	7
 MID_FD120	.EQU	8
 MID_FD111	.EQU	9
 MID_HDNEW	.EQU	10
-MID_MDFSH	.EQU	11
 ;
 ; CHAR DEVICE IDS
 ;
diff --git a/Source/HBIOS/md.asm b/Source/HBIOS/md.asm
index d195df20..cbcf0255 100644
--- a/Source/HBIOS/md.asm
+++ b/Source/HBIOS/md.asm
@@ -10,7 +10,7 @@
 ;--------------------------------------------------------------------------------------------------
 ;	0x00 MEMORY DISK	0x02 RAM DRIVE		%00101000 HD STYLE, NON-REMOVABLE, TYPE-RAM
 ;	0x00 MEMORY DISK	0x01 ROM DRIVE		%00100000 HD STYLE, NON-REMOVABLE, TYPE-ROM
-;	0x00 MEMORY DISK	0x0B FLASH DRIVE	%00111000 HD STYLE, NON-REMOVABLE, TYPE-FLASH
+;	0x00 MEMORY DISK	0x01 FLASH DRIVE	%00111000 HD STYLE, NON-REMOVABLE, TYPE-FLASH
 ;
 MD_DEVCNT	.EQU	2		; NUMBER OF MD DEVICES SUPPORTED
 MD_CFGSIZ	.EQU	8		; SIZE OF CFG TBL ENTRIES
@@ -67,9 +67,7 @@ MD_INIT:
 	LD	A,(FF_RW)		; IF FLASH 
 	OR	A			; FILESYSTEM 
 	JR	NZ,MD_IN1		; CAPABLE, 
-	LD	A,MID_MDFSH		; UPDATE ROM DIO
-	LD	(MD_CFGTBL + MD_CFGSIZ + MD_MID),A
-	LD	A,MD_AFSH
+	LD	A,MD_AFSH		; UPDATE ROM DIO
 	LD	(MD_CFGTBL + MD_CFGSIZ + MD_ATTRIB),A
 MD_IN1:
 	LD	BC,MD_FNTBL
@@ -214,24 +212,23 @@ MD_SEEK:
 MD_READ:
 	CALL	HB_DSKREAD		; HOOK HBIOS DISK READ SUPERVISOR
 ;
-	LD	A,(IY+MD_MID)		; GET ADR OF SECTOR READ FUNC
+	LD	A,(IY+MD_ATTRIB)	; GET ADR OF SECTOR READ FUNC
 	LD	BC,MD_RDSECF		; 
-	CP	MID_MDFSH		; RAM / ROM = MD_RDSEC
+	CP	MD_AFSH			; RAM / ROM = MD_RDSEC
 	JR	Z,MD_RD1		; FLASH     = MD_RDSECF
 	LD	BC,MD_RDSEC
 MD_RD1:
 	LD	(MD_RWFNADR),BC		; SAVE IT AS PENDING IO FUNC
 	JR	MD_RW			; CONTINUE TO GENERIC R/W ROUTINE
-
 ;
 ;
 ;
 MD_WRITE:
 	CALL	HB_DSKWRITE		; HOOK HBIOS DISK WRITE SUPERVISOR
 ;
-	LD	A,(IY+MD_MID)		; GET ADR OF SECTOR WRITE FUNC
+	LD	A,(IY+MD_ATTRIB)	; GET ADR OF SECTOR WRITE FUNC
 	LD	BC,MD_WRSECF		; 
-	CP	MID_MDFSH		; RAM / ROM = MD_WRSEC
+	CP	MD_AFSH			; RAM / ROM = MD_WRSEC
 	JR	Z,MD_WR1		; FLASH     = MD_WRSECF
 	LD	BC,MD_WRSEC
 MD_WR1: