WebSVN - shark - Path Comparison - /shark/trunk/drivers Rev 1078 and /shark/trunk/drivers/ Rev 1689

Ignore whitespace Rev 1078 → Rev 1689

/shark/trunk/drivers/makefile
File deleted

/shark/trunk/drivers/serial/makefile
File deleted

/shark/trunk/drivers/serial/Makefile
0,0 → 1,6
targets:= libserial.a

libserial.a-objs:= scom.o scomirq.o

cppflags+= -I$(srctree)/drivers/serial/include

/shark/trunk/drivers/bttv/makefile
File deleted

 /shark/trunk/drivers/bttv/Makefile
 ,0 → 1,13
+targets:= libbttv.a
+libbttv.a-objs =        \
+        bttv-if.o       \
+        btcx-risc.o     \
+        bttv-cards.o    \
+        bttv-driver.o   \
+        bttv-risc.o     \
+        shark_bttv26.o
+cppflags+= -D__KERNEL__ -I$(srctree)/drivers/bttv/include \
+        -I$(srctree)/drivers/linuxc26/include -I$(curdir)

/shark/trunk/drivers/cm7326/makefile
File deleted

 /shark/trunk/drivers/cm7326/Makefile
 ,0 → 1,23
+# CM7326 - Driver for pc104+ framegrabber
+ifndef BASE
+BASE=../..
+endif
+include $(BASE)/config/config.mk
+LIBRARY       = cm7326
+OBJS_PATH     = $(BASE)/drivers/cm7326
+OBJS = cm7326.o saa7146_core.o saa7146_hlp.o saa7146_i2c.o saa7146_video.o saa7146_fops.o
+OTHERINCL += -I$(BASE)/drivers/cm7326/include -I$(BASE)/drivers/linuxc26/include -I$(BASE)/drivers/i2c/include
+C_OPT += -D__KERNEL__
+include $(BASE)/config/lib.mk
+clean::
+        rm -f $(OBJS)

/shark/trunk/drivers/oldsnd/makefile
File deleted

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

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

 /shark/trunk/drivers/oldsnd/include/drivers/dma.h
 ,7 → 51,7
 #ifndef __DRIVERS_DMA_H__
 #define __DRIVERS_DMA_H__
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/oldsnd/Makefile
 ,0 → 1,10
+targets:= libhsnd.a
+libhsnd.a-objs:=        \
+        sbio.o          \
+        blaster.o       \
+        dma.o           \
+        sound.o
+cppflags+= -I$(curdir)/include

/shark/trunk/drivers/net/makefile
File deleted

 /shark/trunk/drivers/net/netbuff.h
 ,7 → 56,7
 #ifndef __NETBUFF_H__
 #define __NETBUFF_H__
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 #include <sem/sem/sem.h>
 __BEGIN_DECLS

/shark/trunk/drivers/net/include/linux/llpci.h
1,4 → 1,4
#include "ll/sys/cdefs.h"
#include <arch/sys/cdefs.h>

__BEGIN_DECLS
extern int (*pcibios_read_config_byte)

 /shark/trunk/drivers/net/include/linux/netdevice.h
 ,7 → 9,7
 #include <linux/skbuff.h>
 #include <linux/notifier.h>
 #include <time.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/include/linux/stddef.h
 ,7 → 1,7
 #ifndef _LINUX_STDDEF_H
 #define _LINUX_STDDEF_H
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/include/linux/notifier.h
 ,7 → 2,7
 #define __NOTIFIER__
 #include <linux/compatib.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/include/linux/kernel.h
 ,7 → 2,7
 #define __KERNEL__
 #include <linux/compatib.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/include/linux/etherdevice.h
 ,7 → 5,7
 #include <linux/if_ether.h>
 #include <linux/socket.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/include/linux/linuxpci.h
 ,7 → 964,7
 #define PCI_DEVICE_ID_ARK_STINGARK      0xa099
 #define PCI_DEVICE_ID_ARK_2000MT        0xa0a1
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS
 /*

 /shark/trunk/drivers/net/include/linux/interrupt.h
 ,7 → 2,7
 #define __INTERRUPT__
 #include <linux/compatib.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

/shark/trunk/drivers/net/include/linux/compatib.h
1,6 → 1,6
#include <kernel/kern.h>
#include <stdlib.h>
#include "ll/sys/cdefs.h"
#include <arch/sys/cdefs.h>

__BEGIN_DECLS

 /shark/trunk/drivers/net/include/linux/timer.h
 ,7 → 52,7
 #include <kernel/kern.h>
 #include <time.h>
 #include <linux/compatib.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/include/linux/skbuff.h
 ,7 → 2,7
 #define __SKBUFF__
 #include <linux/compatib.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/include/linux/socket.h
 ,7 → 1,7
 #ifndef _LINUX_SOCKET_H
 #define _LINUX_SOCKET_H
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/include/asm/bitops.h
 ,7 → 2,7
 #define __BITOPS__
 #include <linux/compatib.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/include/asm/io.h
 ,7 → 2,7
 #define __IO__
 #include <linux/compatib.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/include/net/sock.h
 ,7 → 56,7
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>       /* struct sk_buff */
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/8390.h
 ,7 → 11,7
 #include <linux/if_ether.h>
 #include <linux/ioport.h>
 #include <linux/skbuff.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/eth_priv.h
 ,7 → 57,7
 #ifndef __ETH_H__
 #define __ETH_H__
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/arp.h
 ,7 → 58,7
 #ifndef __ARP_H__
 #define __ARP_H__
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/net/Makefile
 ,0 → 1,20
+targets:= libnet.a
+libnet.a-objs:=         \
+        eth.o           \
+.o          \
+c509.o         \
+c59x.o         \
+        eepro100.o      \
+        ne.o            \
+        rtl8139.o       \
+        netbuff.o       \
+        arp.o           \
+        udpip.o         \
+        net.o           \
+        net_init.o      \
+        skbuff.o        \
+        misc.o
+cppflags+= -I$(curdir)/include -D__KERNEL__

/shark/trunk/drivers/cpu/makefile
File deleted

 /shark/trunk/drivers/cpu/cpufreq/Makefile
 ,0 → 1,12
+targets:=                       \
+        cpufreq.o               \
+        freq_table.o            \
+        gx-suspmod.o            \
+        p4-clockmod.o           \
+        powernow-k6.o           \
+        powernow-k7.o           \
+        powernow-k8.o           \
+        speedstep-centrino.o    \
+        speedstep-ich.o         \
+        speedstep-lib.o

/shark/trunk/drivers/cpu/shark/Makefile
0,0 → 1,2
targets:= shark_cpu.o

 /shark/trunk/drivers/cpu/Makefile
 ,0 → 1,12
+targets:= libcpu.a
+libcpu.a-objs:=         \
+        common.o        \
+        amd.o           \
+        cyrix.o         \
+        intel.o         \
+        cpufreq/        \
+        shark/          \
+exported-cppflags:= -I$(srctree)/drivers/linuxc26/include -D__KERNEL__

/shark/trunk/drivers/fb/makefile
File deleted

/shark/trunk/drivers/fb/vesa.h
1,4 → 1,4
#include "ll/sys/cdefs.h"
#include <arch/sys/cdefs.h>

typedef struct { /* Questa struttura ci serve per definire */
BYTE red, green, blue; /* la nostra palette. */

/shark/trunk/drivers/fb/gdvesa.c
1,6 → 1,6
#include <ll/i386/hw-data.h>
#include <ll/i386/mem.h>
#include <ll/i386/string.h>
#include <arch/i386/string.h>
#include <ll/i386/x-dos.h>
#include <ll/i386/x-dosmem.h>
#include <ll/i386/cons.h>

/shark/trunk/drivers/fb/riva/Makefile
0,0 → 1,5
targets:= \
fbdev.o \
nv_driver.o \
riva_hw.o

 /shark/trunk/drivers/fb/matrox/Makefile
 ,0 → 1,11
+targets:=                       \
+        g450_pll.o              \
+        matroxfb_DAC1064.o      \
+        matroxfb_Ti3026.o       \
+        matroxfb_accel.o        \
+        matroxfb_base.o         \
+        matroxfb_crtc2.o        \
+        matroxfb_g450.o         \
+        matroxfb_maven.o        \
+        matroxfb_misc.o

 /shark/trunk/drivers/fb/Makefile
 ,0 → 1,27
+targets:= libfb.a
+libfb.a-objs:=          \
+        fbmem.o         \
+        fbcmap.o        \
+        cfbfillrect.o   \
+        softcursor.o    \
+        cfbcopyarea.o   \
+        cfbimgblt.o     \
+        modedb.o        \
+        vga16fb.o       \
+        vgastate.o      \
+        vesafb.o        \
+        radeonfb.o      \
+        shark_fb26.o    \
+        gdvesa.o        \
+        logo.o          \
+        logo_bmp.o      \
+        riva/           \
+        fun16.o         \
+        matrox/
+exported-cppflags:= -I$(srctree)/drivers/linuxc26/include \
+        -I$(curdir)/include -I$(curdir) -D__KERNEL__ -D__i386__
+exported-clfags:= $(CFG_VIDEO_OPT)

/shark/trunk/drivers/parport/makefile
File deleted

 /shark/trunk/drivers/parport/include/drivers/parport.h
 ,7 → 57,7
 #include <kernel/types.h>
 #include <kernel/descr.h>
 #include <math.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

/shark/trunk/drivers/parport/Makefile
0,0 → 1,6
targets:= libpport.a

libpport.a-objs:= ppdrv.o ppnrtdrv.o pppindrv.o

cppflags+= -I$(srctree)/drivers/parport/include

/shark/trunk/drivers/usb/makefile
File deleted

/shark/trunk/drivers/usb/input/Makefile
0,0 → 1,2
targets:= usbmouse.o usbkbd.o

/shark/trunk/drivers/usb/media/Makefile
0,0 → 1,6
targets:= \
pwc-if.o \
pwc-ctrl.o \
pwc-misc.o \
pwc-uncompress.o

/shark/trunk/drivers/usb/serial/Makefile
0,0 → 1,6
targets:= \
generic.o \
usb-serial.o \
pl2303.o \
tty_io.o

 /shark/trunk/drivers/usb/core/Makefile
 ,0 → 1,12
+targets:=               \
+        config.o        \
+        usb-debug.o     \
+        hub.o           \
+        hcd.o           \
+        urb.o           \
+        message.o       \
+        file.o          \
+        buffer.o        \
+        driverfs.o      \
+        hcd-pci.o

/shark/trunk/drivers/usb/host/Makefile
0,0 → 1,5
targets:= \
ohci-hcd.o \
ehci-hcd.o \
uhci-hcd.o

 /shark/trunk/drivers/usb/Makefile
 ,0 → 1,15
+targets:= libusb.a
+libusb.a-objs:=         \
+        core/           \
+        host/           \
+        shark_glue/     \
+        media/          \
+        input/          \
+        serial/
+exported-cppflags:= -I$(srctree)/drivers/linuxc26/include       \
+        -I$(curdir)/core -I$(curdir)/host -D__KERNEL__          \
+        -DCONFIG_USB_HIDINPUT -DCONFIG_USB_SERIAL_PL2303        \
+        -DCONFIG_USB_DEBUG

 /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/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/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/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/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/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/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

 /shark/trunk/drivers/pci6025e/include/drivers/pci6025e/pci6025e.h
 ,7 → 37,7
 #include "regconst.h"
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/pci6025e/include/drivers/pci6025e/timer.h
 ,7 → 37,7
 #include <drivers/pci6025e/pci6025e.h>
 #include <drivers/pci6025e/regconst.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/pci6025e/include/drivers/pci6025e/dio_ppi.h
 ,7 → 34,7
 #define _MY_DIO_H_
 #include <drivers/pci6025e/pci6025e.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/pci6025e/include/drivers/pci6025e/adc.h
 ,7 → 33,7
 #include <drivers/pci6025e/pci6025e.h>
 #include <drivers/pci6025e/regconst.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/pci6025e/include/drivers/pci6025e/dac.h
 ,7 → 33,7
 #include <drivers/pci6025e/pci6025e.h>
 #include <drivers/pci6025e/regconst.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/pci6025e/Makefile
 ,0 → 1,11
+targets:= lib6025e.a
+lib6025e.a-objs:=       \
+        pci6025e.o      \
+        tim/            \
+        dac/            \
+        dio_ppi/        \
+        adc/
+exported-cppflags:= -I$(srctree)/drivers/pci6025e/include

/shark/trunk/drivers/input/mouse/Makefile
0,0 → 1,5
targets:= \
psmouse-base.o \
logips2pp.o \
synaptics.o

 /shark/trunk/drivers/input/shark/Makefile
 ,0 → 1,10
+targets:=               \
+        shark_input.o   \
+        shark_keymap.o  \
+        shark_mouse.o   \
+        shark_keyb.o    \
+        mcurtxt.o       \
+        mcurgrx.o       \
+        shark_spk.o     \
+        shark_joy.o

/shark/trunk/drivers/input/handler/Makefile
0,0 → 1,7
targets:= \
mouse.o \
keyboard.o \
speaker.o \
evbug.o \
joystick.o

 /shark/trunk/drivers/input/Makefile
 ,0 → 1,15
+targets:= libinput.a
+libinput.a-objs:=       \
+        input.o         \
+        serio/          \
+        mouse/          \
+        keyboard/       \
+        misc/           \
+        gameport/       \
+        joystick/       \
+        handler/        \
+        shark/
+exported-cppflags:= -I$(srctree)/drivers/linuxc26/include -D__KERNEL__

 /shark/trunk/drivers/grx/include/drivers/gd.h
 ,7 → 54,7
 #include <ll/sys/types.h>
 /* Std 16 colors... are in cons.h !!!*/
 #include <ll/i386/cons.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/grx/include/drivers/glib.h
 ,7 → 54,7
 #include <ll/sys/types.h>
 #include <drivers/gd.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/grx/drawfun/fun16.c
 ,7 → 19,7
 #include <ll/i386/hw-data.h>
 #include <ll/i386/hw-instr.h>
 #include <ll/i386/mem.h>
-#include <ll/stdlib.h>
+#include <arch/stdlib.h>
 #include <drivers/gd.h>

 /shark/trunk/drivers/grx/drawfun/fun8.c
 ,7 → 19,7
 #include <ll/i386/hw-data.h>
 #include <ll/i386/hw-instr.h>
 #include <ll/i386/mem.h>
-#include <ll/stdlib.h>
+#include <arch/stdlib.h>
 #include <drivers/gd.h>

 /shark/trunk/drivers/grx/drawfun/fun16.h
 ,7 → 16,7
  *
  */
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS
 #define memsetw(addr, val, n) {LIN_ADDR i;      for(i = addr; i < addr + n; i += 2) lmempokew(i, val);}

 /shark/trunk/drivers/grx/drawfun/fun8.h
 ,7 → 16,7
  *
  */
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS
 void RdWin_256(WORD x1, WORD y1, WORD x2, WORD y2, BYTE *buf);

 /shark/trunk/drivers/grx/Makefile
 ,0 → 1,10
+targets:= libgrx.a
+libgrx.a-objs:=         \
+        gd.o glib.o     \
+        palette.o       \
+        drivers/        \
+        drawfun/
+exported-cppflags:= -I$(curdir)/include/

 /shark/trunk/drivers/grx/drivers/trident.h
 ,7 → 16,7
  *
  */
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS
 int trident_test(void);

 /shark/trunk/drivers/grx/drivers/vesa.h
 ,7 → 17,7
  */
 #include <ll/i386/x-dos.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/grx/drivers/gdvesa.c
 ,7 → 18,7
 #include <ll/i386/hw-data.h>
 #include <ll/i386/mem.h>
-#include <ll/i386/string.h>
+#include <arch/i386/string.h>
 #include <ll/i386/x-dos.h>
 #include <ll/i386/x-dosmem.h>
 #include <ll/i386/cons.h>

 /shark/trunk/drivers/grx/drivers/gdvesa1.c
 ,7 → 18,7
 #include <ll/i386/hw-data.h>
 #include <ll/i386/mem.h>
-#include <ll/i386/string.h>
+#include <arch/i386/string.h>
 #include <ll/i386/x-dos.h>
 #include <ll/i386/x-dosmem.h>
 #include <ll/i386/cons.h>

 /shark/trunk/drivers/grx/drivers/s3.h
 ,7 → 16,7
  *
  */
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS
 int s3_test(void);

 /shark/trunk/drivers/grx/glib.c
 ,7 → 18,7
 #include <ll/i386/hw-data.h>
 #include <ll/i386/mem.h>
-#include <ll/i386/string.h>
+#include <arch/i386/string.h>
 #include <ll/i386/error.h>
 #include <ll/sys/ll/ll-func.h>

 /shark/trunk/drivers/cons/cons1.c
 ,10 → 25,10
 #include <ll/i386/hw-instr.h>
 #include <ll/i386/cons.h>
 /* #include <xsys.h>*/
-#include <ll/i386/string.h>
-#include <ll/i386/stdlib.h>
-#include <ll/i386/stdio.h>
-#include <ll/stdarg.h>
+#include <arch/i386/string.h>
+#include <arch/i386/stdlib.h>
+#include <arch/i386/stdio.h>
+#include <arch/stdarg.h>
 FILE(Cons1);
 /* CGA compatible registers value */

 /shark/trunk/drivers/cons/cons2.c
 ,10 → 25,10
 #include <ll/i386/hw-instr.h>
 #include <ll/i386/cons.h>
 /* #include <xsys.h>*/
-#include <ll/i386/string.h>
-#include <ll/i386/stdlib.h>
-#include <ll/i386/stdio.h>
-#include <ll/stdarg.h>
+#include <arch/i386/string.h>
+#include <arch/i386/stdlib.h>
+#include <arch/i386/stdio.h>
+#include <arch/stdarg.h>
 FILE(Cons2);

 /shark/trunk/drivers/cons/message.c
 ,10 → 24,10
 #include <ll/i386/hw-data.h>
 #include <ll/i386/hw-instr.h>
 #include <ll/i386/cons.h>
-#include <ll/i386/string.h>
-#include <ll/i386/stdlib.h>
-#include <ll/i386/stdio.h>
-#include <ll/stdarg.h>
+#include <arch/i386/string.h>
+#include <arch/i386/stdlib.h>
+#include <arch/i386/stdio.h>
+#include <arch/stdarg.h>
 FILE(message);

 /shark/trunk/drivers/cons/cprintf.c
 ,10 → 24,10
 #include <ll/i386/hw-data.h>
 #include <ll/i386/hw-instr.h>
 #include <ll/i386/cons.h>
-#include <ll/i386/string.h>
-#include <ll/i386/stdlib.h>
-#include <ll/i386/stdio.h>
-#include <ll/stdarg.h>
+#include <arch/i386/string.h>
+#include <arch/i386/stdlib.h>
+#include <arch/i386/stdio.h>
+#include <arch/stdarg.h>
 FILE(cprintf);

 /shark/trunk/drivers/cons/crtwin.c
 ,7 → 60,7
 //#include <cons.h>
 #include <kernel/kern.h>
-#include <ll/string.h>
+#include <arch/string.h>
 #include <drivers/crtwin.h>
 #define CUPS1   201        /* Definizione caratteri per */

 /shark/trunk/drivers/cons/Makefile
 ,0 → 1,11
+targets:= libcons.a
+libcons.a-objs:=        \
+        cons1.o         \
+        cons2.o         \
+        message.o       \
+        cprintf.o       \
+        crtwin.o
+cppflags+= -I$(srctree)/drivers/cons/include

 /shark/trunk/drivers/pcl812/include/drivers/pclab.h
 ,7 → 3,7
 /*      le funzioni di aquisizione contenute in PCLAB.C         */
 /*--------------------------------------------------------------*/
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/linuxc26/kobject.c
 ,7 → 12,7
 #undef DEBUG
-#include <ll/stdarg.h>
+#include <arch/stdarg.h>
 #include <linuxcomp.h>

 /shark/trunk/drivers/linuxc26/Makefile
 ,0 → 1,24
+targets:= libcomp26.a
+libcomp26.a-objs:=              \
+        bus.o                   \
+        linuxcomp.o             \
+        core.o                  \
+        driver.o                \
+        vsprintf.o              \
+        interface.o             \
+        kobject.o               \
+        shark_linuxc26.o        \
+        shark_glue.o            \
+        class.o                 \
+        videodev.o              \
+        linux_kthread.o         \
+        waitqueue.o             \
+        int.o                   \
+        timer.o                 \
+        cmdline.o               \
+        video-buf.o             \
+        shark_videodev.o
+cppflags+= -I$(srctree)/drivers/linuxc26/include -D__KERNEL__

 /shark/trunk/drivers/pci/Makefile
 ,0 → 1,29
+targets:= libpci.a
+libpci.a-objs:=         \
+        access.o        \
+        bus.o           \
+        names.o         \
+        pci.o           \
+        pci-driver.o    \
+        pool.o          \
+        probe.o         \
+        quirks.o        \
+        remove.o        \
+        search.o        \
+        setup-res.o     \
+        setup-irq.o     \
+        setup-bus.o     \
+        syscall.o       \
+        i386.o          \
+        common.o        \
+        fixup.o         \
+        irq.o           \
+        legacy.o        \
+        pcbios.o        \
+        direct.o        \
+        shark_pci26.o   \
+        pci20to26.o
+cppflags+= -I$(srctree)/drivers/linuxc26/include -D__KERNEL__

 /shark/trunk/drivers/oldchar/8042.h
 ,7 → 63,7
 #ifndef __8042_H__
 #define __8042_H__
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/oldchar/include/drivers/mouse.h
 ,7 → 76,7
 #include <kernel/const.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/oldchar/ps2mouse.h
 ,7 → 59,7
 #define __PS2MOUSE_H__
 #include <drivers/mouse.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/oldchar/sermouse.h
 ,7 → 59,7
 #define __SERMOUSE_H__
 #include <drivers/mouse.h>
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/oldchar/_mouse.h
 ,7 → 52,7
 #ifndef ___MOUSE_H__
 #define ___MOUSE_H__
-#include "ll/sys/cdefs.h"
+#include <arch/sys/cdefs.h>
 __BEGIN_DECLS

 /shark/trunk/drivers/oldchar/Makefile
 ,0 → 1,13
+targets:= liboldch.a
+liboldch.a-objs:=       \
+        keyb.o          \
+        mouse.o         \
+        ps2mouse.o      \
+.o          \
+        mcurtxt.o       \
+        mcurgrx.o
+cppflags+= -I$(srctree)/drivers/oldchar/include \
+        -I$(srctree)/drivers/grx/include

/shark/trunk/drivers/pcl833/Makefile
0,0 → 1,6
targets:= libpcl833.a

libpcl833.a-objs:= pcl833.o

cppflags+= -I$(curdir)/include

 /shark/trunk/drivers/i2c/Makefile
 ,0 → 1,10
+targets:= libi2c.a
+libi2c.a-objs:=         \
+        i2c-dev.o       \
+        i2c-core.o      \
+        shark_i2c26.o   \
+        algos/
+exported-cppflags:= -I$(srctree)/drivers/linuxc26/include -D__KERNEL__

 /shark/trunk/drivers/Makefile
 ,0 → 1,21
+targets:=               \
+        block/          \
+        bttv/           \
+        cons/           \
+        cpu/            \
+        fb/             \
+        grx/            \
+        i2c/            \
+        input/          \
+        linuxc26/       \
+        net/            \
+        oldchar/        \
+        oldsnd/         \
+        parport/        \
+        pci/            \
+        pci6025e/       \
+        pcl812/         \
+        pcl833/         \
+        serial/         \
+        usb/

Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1078 → Rev 1689