Merge pull request #1716 from ghaerr/fd

[kernel] Add @Mellvik's direct floppy driver
ghaerr · Sep 13, 2023 · 1d0c86e · 1d0c86e
2 parents ead41c2 + 48a10e9
commit 1d0c86e
Show file tree

Hide file tree

Showing 11 changed files with 600 additions and 332 deletions.
diff --git a/elks/arch/i86/defconfig b/elks/arch/i86/defconfig
@@ -102,7 +102,6 @@ CONFIG_BLK_DEV_BHD=y
 CONFIG_IDE_PROBE=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_HD is not set
-# CONFIG_DMA is not set
 
 #
 # Additional block devices

diff --git a/elks/arch/i86/drivers/block/Makefile b/elks/arch/i86/drivers/block/Makefile
@@ -56,14 +56,15 @@ ifeq ($(CONFIG_BLK_DEV_SSD_SD8018X), y)
 	OBJS += ssd.o ssd-sd.o spi-8018x.o
 endif
 
+# experimental direct fd support
+ifeq ($(CONFIG_BLK_DEV_FD), y)
+OBJS += directfd.o
+endif
+
 # experimental (and not working) direct hd support
 ifeq ($(CONFIG_BLK_DEV_HD), y)
 OBJS += directhd.o
 endif
-# experimental (and not compiling) direct fd support
-ifeq ($(CONFIG_BLK_DEV_FD), y)
-OBJS += directfd.o
-endif
 
 #########################################################################
 # Commands.

diff --git a/elks/arch/i86/drivers/block/blk.h b/elks/arch/i86/drivers/block/blk.h
@@ -19,6 +19,7 @@ struct request {
     ramdesc_t rq_seg;           /* L1 or L2 ext/xms buffer segment */
     struct buffer_head *rq_bh;  /* system buffer head for notifications and locking */
     struct request *rq_next;    /* next request, used when async I/O */
+    int rq_errors;              /* only used by direct floppy driver */
 };
 
 #define RQ_INACTIVE     0
@@ -74,10 +75,10 @@ extern void resetup_one_dev(struct gendisk *dev, int drive);
 
 #ifdef FLOPPYDISK
 
-static void floppy_on(unsigned int nr);
+static void floppy_on(int nr);
 static void floppy_off(unsigned int nr);
 
-#define DEVICE_NAME "fd"
+#define DEVICE_NAME "df"
 #define DEVICE_INTR do_floppy
 #define DEVICE_REQUEST do_fd_request
 #define DEVICE_NR(device) ((device) & 3)
@@ -146,7 +147,7 @@ static void end_request(int uptodate)
     mark_buffer_uptodate(bh, uptodate);
     unlock_buffer(bh);
 
-    DEVICE_OFF(req->dev);
+    DEVICE_OFF(req->rq_dev);
     CURRENT = req->rq_next;
     req->rq_status = RQ_INACTIVE;
 

diff --git a/elks/arch/i86/drivers/block/config.in b/elks/arch/i86/drivers/block/config.in
@@ -32,13 +32,9 @@ mainmenu_option next_comment
 	    bool '  IDE hard drive CHS probe'	CONFIG_IDE_PROBE	y
 	fi
 
-	if [ "$CONFIG_BLK_DEV_FD" = "y" ]; then
-	    define_bool CONFIG_DMA y
-	else
-	    define_bool CONFIG_DMA n
-	fi
-
 	comment 'Additional block devices'
+	bool 'Direct floppy driver (experimental)' CONFIG_BLK_DEV_FD   n
+
 	bool 'RAM disk support'			CONFIG_BLK_DEV_RAM	y
 	if [ "$CONFIG_BLK_DEV_RAM" == "y" ]; then
 		hex 'Preload RAM disk segment address' CONFIG_RAMDISK_SEGMENT 0