From 8942de6c0d7e9f64de6affaddd0583534329bb96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 20 Jun 2008 22:58:15 +0000 Subject: [PATCH] Make the floppy driver buildable again... even under Haiku. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26050 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/arch/x86/floppy/Jamfile | 28 +++---------------- .../drivers/arch/x86/floppy/device_icons.c | 8 ++++-- .../kernel/drivers/arch/x86/floppy/floppy.c | 8 ++++-- .../kernel/drivers/arch/x86/floppy/floppy.h | 22 +++++++++++++-- .../drivers/arch/x86/floppy/floppy_ctrl.c | 8 ++++-- 5 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/add-ons/kernel/drivers/arch/x86/floppy/Jamfile b/src/add-ons/kernel/drivers/arch/x86/floppy/Jamfile index 0553bb82a9..fd20606c55 100644 --- a/src/add-ons/kernel/drivers/arch/x86/floppy/Jamfile +++ b/src/add-ons/kernel/drivers/arch/x86/floppy/Jamfile @@ -1,32 +1,12 @@ SubDir HAIKU_TOP src add-ons kernel drivers arch x86 floppy ; +SetSubDirSupportedPlatformsBeOSCompatible ; + +UsePrivateHeaders drivers kernel ; + KernelAddon floppy : floppy.c floppy_ctrl.c device_icons.c ; -# 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 -# : -# $(HAIKU_TOP)/src/kernel/ldscripts/$(TARGET_ARCH)/add-on.ld -# : -# -Bdynamic -shared -# : -# : -# drivers/dev/floppy -# ; - diff --git a/src/add-ons/kernel/drivers/arch/x86/floppy/device_icons.c b/src/add-ons/kernel/drivers/arch/x86/floppy/device_icons.c index 2590a50da9..7766a2e30f 100644 --- a/src/add-ons/kernel/drivers/arch/x86/floppy/device_icons.c +++ b/src/add-ons/kernel/drivers/arch/x86/floppy/device_icons.c @@ -1,7 +1,9 @@ /* - * OpenBeOS floppy driver - * (c) 2003, OpenBeOS project. - * François Revol, revol@free.fr + * Copyright 2003-2008, Haiku. + * Distributed under the terms of the MIT License. + * + * Authors: + * François Revol */ const char floppy_icon[] = { diff --git a/src/add-ons/kernel/drivers/arch/x86/floppy/floppy.c b/src/add-ons/kernel/drivers/arch/x86/floppy/floppy.c index 528f0177bc..3c3f77887a 100644 --- a/src/add-ons/kernel/drivers/arch/x86/floppy/floppy.c +++ b/src/add-ons/kernel/drivers/arch/x86/floppy/floppy.c @@ -1,7 +1,9 @@ /* - * OpenBeOS floppy driver - * (c) 2003, OpenBeOS project. - * François Revol, revol@free.fr + * Copyright 2003-2008, Haiku. + * Distributed under the terms of the MIT License. + * + * Authors: + * François Revol */ /* diff --git a/src/add-ons/kernel/drivers/arch/x86/floppy/floppy.h b/src/add-ons/kernel/drivers/arch/x86/floppy/floppy.h index b115de523b..57421b6203 100644 --- a/src/add-ons/kernel/drivers/arch/x86/floppy/floppy.h +++ b/src/add-ons/kernel/drivers/arch/x86/floppy/floppy.h @@ -1,7 +1,9 @@ /* - * OpenBeOS floppy driver - * (c) 2003, OpenBeOS project. - * François Revol, revol@free.fr + * Copyright 2003-2008, Haiku. + * Distributed under the terms of the MIT License. + * + * Authors: + * François Revol */ #ifndef _FLOPPY_H @@ -10,7 +12,21 @@ #include #include #include + +// TODO: switch to native lock. +#ifdef __HAIKU__ +#include +typedef recursive_lock lock; +#define new_lock recursive_lock_init +#define free_lock recursive_lock_destroy +#define LOCK(l) recursive_lock_lock(&l); +#define UNLOCK(l) recursive_lock_unlock(&l); +#else +#ifndef _IMPEXP_KERNEL +#define _IMPEXP_KERNEL +#endif #include "lock.h" +#endif #define FLO "floppy: " #if defined(DEBUG) && DEBUG > 0 diff --git a/src/add-ons/kernel/drivers/arch/x86/floppy/floppy_ctrl.c b/src/add-ons/kernel/drivers/arch/x86/floppy/floppy_ctrl.c index 45471c82bc..4f06ab77e8 100644 --- a/src/add-ons/kernel/drivers/arch/x86/floppy/floppy_ctrl.c +++ b/src/add-ons/kernel/drivers/arch/x86/floppy/floppy_ctrl.c @@ -1,7 +1,9 @@ /* - * OpenBeOS floppy driver - * (c) 2003, OpenBeOS project. - * François Revol, revol@free.fr + * Copyright 2003-2008, Haiku. + * Distributed under the terms of the MIT License. + * + * Authors: + * François Revol */