Post-merge fixing to make the floppy driver work.

diff --git a/Kernel/platform-amstradnc/config.h b/Kernel/platform-amstradnc/config.h
index 45d347a..0da8f5e 100644 (file)
--- a/Kernel/platform-amstradnc/config.h
+++ b/Kernel/platform-amstradnc/config.h
@@ -58,7 +58,7 @@
 #define NBUFS    10       /* Number of block buffers */
 #ifdef CONFIG_NC200
 #define NMOUNTS        2         /* Floppy can also be mounted */
-#define BOOTDEVICENAMES "fd#,hd#"
+#define BOOTDEVICENAMES "hd#,fd#"
 #define MAX_BLKDEV 1  /* Single floppy */
 #else
 #define NMOUNTS         1        /* Number of mounts at a time - nothing mountable! */

diff --git a/Kernel/platform-amstradnc/devfd.c b/Kernel/platform-amstradnc/devfd.c
index aa1e687..4360bae 100644 (file)
--- a/Kernel/platform-amstradnc/devfd.c
+++ b/Kernel/platform-amstradnc/devfd.c
@@ -3,7 +3,6 @@
 #include <printf.h>
 #include <devfd.h>
 #include <device.h>
-#include <blkdev.h>
 #include <timer.h>
 
 static timer_t spindown_timer = 0;

diff --git a/Kernel/platform-amstradnc/devices.c b/Kernel/platform-amstradnc/devices.c
index 31f7815..6587f37 100644 (file)
--- a/Kernel/platform-amstradnc/devices.c
+++ b/Kernel/platform-amstradnc/devices.c
@@ -11,20 +11,19 @@
 #include <printf.h>
 
 #if defined CONFIG_NC200
-#include <devfd.h>
-#include <blkdev.h>
+#include "devfd.h"
 #endif
 
 struct devsw dev_tab[] =  /* The device driver switch table */
 {
-  /* 0: /dev/fd                Floppy disc block devices (NC200 only) */
+  /* 0: /dev/hd                Hard disc block devices (Really PCMCIA) */
+  {  rd_open,     no_close,    rd_read,   rd_write,   no_ioctl },
+  /* 1: /dev/fd                Floppy disc block devices (NC200 only) */
 #if defined CONFIG_NC200
   {  devfd_open, no_close, devfd_read, devfd_write, no_ioctl },
 #else
   {  nxio_open,     no_close,    no_rdwr,   no_rdwr,   no_ioctl },
 #endif
-  /* 1: /dev/hd                Hard disc block devices (Really PCMCIA) */
-  {  rd_open,     no_close,    rd_read,   rd_write,   no_ioctl },
   /* 2: /dev/tty       TTY devices */
   {  nc100_tty_open,     nc100_tty_close,   tty_read,  tty_write,  gfx_ioctl },
   /* 3: /dev/lpr       Printer devices */

diff --git a/Kernel/platform-amstradnc/nc200/Makefile b/Kernel/platform-amstradnc/nc200/Makefile
index 40b4f53..5ebc2c6 100644 (file)
--- a/Kernel/platform-amstradnc/nc200/Makefile
+++ b/Kernel/platform-amstradnc/nc200/Makefile
@@ -1,4 +1,5 @@
 CSRCS = \
+       ../devfd.c \
        ../devlpr.c \
        ../devtty.c \
        ../devrd.c \
@@ -12,6 +13,7 @@ ASRCS = \
        ../crt0.s \
        ../tricks.s \
        ../commonmem.s \
+       ../fdc765.s
 
 COBJS = $(CSRCS:.c=.rel)
 AOBJS = $(ASRCS:.s=.rel)

diff --git a/Kernel/platform-amstradnc/nc200/fuzix.lnk b/Kernel/platform-amstradnc/nc200/fuzix.lnk
index c6f21f7..d664db7 100644 (file)
--- a/Kernel/platform-amstradnc/nc200/fuzix.lnk
+++ b/Kernel/platform-amstradnc/nc200/fuzix.lnk
@@ -35,6 +35,8 @@ devsys.rel
 audio.rel
 usermem.rel
 usermem_std-z80.rel
+platform-amstradnc/devfd.rel
+platform-amstradnc/fdc765.rel
 platform-amstradnc/devlpr.rel
 platform-amstradnc/devtty.rel
 platform-amstradnc/devaudio.rel