WebSVN - shark - Path Comparison - /shark/trunk/drivers/block Rev 1063 and /shark/trunk/drivers/block Rev 1689

Ignore whitespace Rev 1063 → Rev 1689

/shark/trunk/drivers/block/makefile
File deleted

 /shark/trunk/drivers/block/sstf/sstf.h
 ,7 → 42,7
 #include "phdsk.h"
 #include "glue.h"
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

/shark/trunk/drivers/block/sstf/Makefile
0,0 → 1,2
targets:= sstf.o

 /shark/trunk/drivers/block/fcfs/fcfs.h
 ,7 → 42,7
 #include "phdsk.h"
 #include "glue.h"
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

/shark/trunk/drivers/block/fcfs/Makefile
0,0 → 1,2
targets:= fcfs.o

 /shark/trunk/drivers/block/glue.h
 ,7 → 37,7
  */
 #include <kernel/int_sem.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS
 ,7 → 136,7
 /* timer functions */
-#include <ll/time.h>
+#include <arch/time.h>
 /* all in usec */

 /shark/trunk/drivers/block/ide.h
 ,7 → 57,7
 #include "glue.h"
 #include "bdev.h"
 #include "bqueue.h"
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/block/edf/edf.h
 ,7 → 42,7
 #include "phdsk.h"
 #include "glue.h"
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

/shark/trunk/drivers/block/edf/Makefile
0,0 → 1,2
targets:= edf.o

 /shark/trunk/drivers/block/phdsk.h
 ,7 → 49,7
 #define __PHDSK_H__
 #include "glue.h"
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/block/idereq.h
 ,7 → 22,7
 #include "bqueue.h"
 #include "glue.h"
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/block/lodsk.h
 ,7 → 50,7
 #define __LODSK_H__
 #include "glue.h"
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/block/ideglue.h
 ,7 → 18,7
 #ifndef __IDEGLUE_H
 #define __IDEGLUE_H
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/block/look/look.h
 ,7 → 42,7
 #include "phdsk.h"
 #include "glue.h"
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

/shark/trunk/drivers/block/look/Makefile
0,0 → 1,2
targets:= look.o

 /shark/trunk/drivers/block/pscan/pscan.h
 ,7 → 42,7
 #include "phdsk.h"
 #include "glue.h"
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

/shark/trunk/drivers/block/pscan/Makefile
0,0 → 1,2
targets:= pscan.o

 /shark/trunk/drivers/block/bdev.h
 ,7 → 52,7
 #include "glue.h"
 #include <fs/bdevinit.h>
 #include <fs/bdev.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/block/clook/clook.h
 ,7 → 43,7
 #include "phdsk.h"
 #include "glue.h"
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

/shark/trunk/drivers/block/clook/Makefile
0,0 → 1,2
targets:= clook.o

 /shark/trunk/drivers/block/debug.h
 ,7 → 16,7
  *
  */
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/block/bqueue.h
 ,7 → 74,7
 #include "pscan/pscan.h"
 #endif
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/block/Makefile
 ,0 → 1,35
+_SCHED_FCFS=y
+cppflags-$(_SCHED_FCFS):= -D_SCHED_FCFS
+objs-$(_SCHED_FCFS):= fcfs/
+cppflags-$(_SCHED_SSTF):= -D_SCHED_SSTF
+objs-$(_SCHED_SSTF):= sstf/
+cppflags-$(_SCHED_LOOK):= -D_SCHED_LOOK
+objs-$(_SCHED_LOOK):= look/
+cppflags-$(_SCHED_CLOOK):= -D_SCHED_CLOOK
+objs-$(_SCHED_CLOOK):= clook/
+cppflags-$(_SCHED_EDF):= -D_SCHED_EDF
+objs-$(_SCHED_EDF):= edf/
+cppflags-$(_SCHED_PSCAN):= -D_SCHED_PSCAN
+objs-$(_SCHED_PSCAN):= pscan/
+targets:= libblk.a
+libblk.a-objs:=         \
+        bdev.o          \
+        lodsk.o         \
+        phdsk.o         \
+        glue.o          \
+        ide.o           \
+        idereq.o        \
+        idelow.o        \
+        $(objs-y)
+exported-cppflags:= $(cppflags-y) -DNDEBUG -I$(curdir) \
+        -imacros $(srctree)/include/fs/bdevconf.h