From ce5d0dee99f657904da31fdf4e17d6ed2aea9213 Mon Sep 17 00:00:00 2001
From: Philippe Houdoin <philippe.houdoin@gmail.com>
Date: Tue, 27 Jan 2004 20:57:29 +0000
Subject: [PATCH] Ooops, Francois Revol's floppy driver is supposed to target
 R5 kernel, not yet OBOS one. Commented out OBOS kernel build rules, and now
 build for R5. NOTA: It's a PIO-read-only implementation currently.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6363 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../kernel/drivers/arch/x86/floppy/Jamfile    | 52 ++++++++++++-------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/add-ons/kernel/drivers/arch/x86/floppy/Jamfile b/src/add-ons/kernel/drivers/arch/x86/floppy/Jamfile
index d7ab35d471..b488976753 100644
--- a/src/add-ons/kernel/drivers/arch/x86/floppy/Jamfile
+++ b/src/add-ons/kernel/drivers/arch/x86/floppy/Jamfile
@@ -1,24 +1,40 @@
 SubDir OBOS_TOP src add-ons kernel drivers arch x86 floppy ;
 
-KernelObjects
+R5KernelAddon floppy : kernel drivers bin :
 	floppy.c
-	floppy_ctrl.c 
+	floppy_ctrl.c
 	device_icons.c
-	:
-	-fno-pic -D_KERNEL_MODE
-	;
+;
 
-KernelLd floppy :
-	<$(SOURCE_GRIST)>floppy.o
-	<$(SOURCE_GRIST)>floppy_ctrl.o
-	<$(SOURCE_GRIST)>device_icons.o
-	kernel.so
-	:
-	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld
-	:
-	-Bdynamic -shared
-	:
-	:
-	drivers/dev/floppy
-; 
+# Link to kernel/drivers/dev/disk
+{
+	local dir = [ FDirName $(OBOS_ADDON_DIR) kernel drivers dev disk ] ;
+	local instDriver = <kernel!drivers!dev!disk>floppy ;
+	MakeLocate $(instDriver) : $(dir) ;
+	RelSymLink $(instDriver) : floppy ;
+}
+
+# Not ready for prime-time yet: R5 floppy driver replacement at the moment.
+
+# KernelObjects
+#	floppy.c
+#	floppy_ctrl.c 
+#	device_icons.c
+#	:
+#	-fno-pic -D_KERNEL_MODE
+#	;
+#
+# KernelLd floppy :
+#	<$(SOURCE_GRIST)>floppy.o
+#	<$(SOURCE_GRIST)>floppy_ctrl.o
+#	<$(SOURCE_GRIST)>device_icons.o
+#	kernel.so
+#	:
+#	$(OBOS_TOP)/src/kernel/ldscripts/$(OBOS_ARCH)/add-on.ld
+#	:
+#	-Bdynamic -shared
+#	:
+#	:
+#	drivers/dev/floppy
+# ;