Subject:
Source tree cleanup (2) (src/drivers)
From:
Alain Volmat ####@####.####
Date:
1 May 2005 03:19:36 +0100
Message-Id: <20050501021926.GA3850@pop.mail.yahoo.com>
Greg,
I still continue trying to make the source tree a bit more clear.
Please let me know if you are against that so that I don't do that
for nothing.
This time, the drivers. Basically it contains keyboard, mouse, video (FB and
others) and so others stuffs. For now I only do mouse and keyboards.
I added a 2 news folders (mouse and keyb). (I don't send a patch for that
since it is only moving files).
Files to move from src/drivers to src/drivers/mouse (hope I didn't missed any)
mou_dos.c
mou_dynapro.c
mou_fbsd.c
mou_gpm.c
mou_harrier.c
mou_mt.c
mou_null.c
mou_ps5.c
mou_rtems.c
mou_ser.c
mou_sun.c
mou_touchscreen.c
mou_x11.c
mou_yopy.c
touchscreen_ads7846.h
touchscreen_ads.h
touchscreen_ipaq.h
touchscreen_ucb1x00.h
touchscreen_zaurus.h
Files to move from src/drivers to src/drivers/keyb
kbd_bios.c
kbd_djgr.c
kbd_fbsd.c
kbd_ipaq.c
kbd_lirc.c
kbd_null.c
kbd_pac.c
kbd_pipe.c
kbd_rtems.c
kbd_tc.c
kbd_tty.c
kbd_ttyscan.c
kbd_x11.c
keymap_standard.h
keymap_zaurus.h
mwlirc.c
mwlirc.h
I modified Objects.rules to match those modifications. (I don't think
adding a new level of "Makefile/Objects.rules" is necessary).
The attached file 'patch_keyb_mouse' contains modifications.
Alain
--- microwin/src/drivers/Objects.rules 2005-04-27 22:23:32.000000000 +0900
+++ microwin_new/src/drivers/Objects.rules 2005-05-01 10:58:02.000000000 +0900
@@ -97,12 +124,12 @@
$(MW_DIR_OBJ)/drivers/fblin24.o \
$(MW_DIR_OBJ)/drivers/fblin32.o \
$(MW_DIR_OBJ)/drivers/fblin32alpha.o \
- $(MW_DIR_OBJ)/drivers/mou_x11.o
+ $(MW_DIR_OBJ)/drivers/mouse/mou_x11.o
ifneq ($(PIPEKBD), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_x11.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_x11.o
else
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_pipe.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_pipe.o
endif
ifeq ($(NOFONTSORCLIPPING), Y)
@@ -147,82 +174,82 @@
### Desktop GPM mouse driver
ifeq ($(GPMMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_gpm.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_gpm.o
endif
### serial mouse driver
ifeq ($(SERMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_ser.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_ser.o
endif
### Generic touchscreen driver
ifeq ($(ADSMOUSE), Y)
CFLAGS += -DTOUCHSCREEN_ADS=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_touchscreen.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_touchscreen.o
endif
ifeq ($(ADS7846MOUSE), Y)
CFLAGS += -DTOUCHSCREEN_ADS7846=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_touchscreen.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_touchscreen.o
endif
ifeq ($(IPAQMOUSE), Y)
CFLAGS += -DTOUCHSCREEN_IPAQ=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_touchscreen.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_touchscreen.o
endif
ifeq ($(TUXMOUSE), Y)
CFLAGS += -DTOUCHSCREEN_TUXSCREEN=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_touchscreen.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_touchscreen.o
endif
ifeq ($(ZAURUSMOUSE), Y)
CFLAGS += -DTOUCHSCREEN_ZAURUS=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_touchscreen.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_touchscreen.o
endif
### Embedded Planet touchscreen
ifeq ($(EPMOUSE), Y)
CFLAGS += -DTOUCHSCREEN_EPLANET
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_vrlinux.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_vrlinux.o
endif
### Vtech Helio touchscreen
ifeq ($(VHMOUSE), Y)
CFLAGS += -DTOUCHSCREEN_HELIO=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_vrlinux.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_vrlinux.o
endif
#### Yopy touchscreen
ifeq ($(YOPYMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_yopy.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_yopy.o
endif
#### Psion 5 touchscreen
ifeq ($(PSIONMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_ps5.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_ps5.o
endif
#### NEC Harrier touchscreen
ifeq ($(HARRIERMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_harrier.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_harrier.o
endif
#### MicroTouch serial touchscreen
ifeq ($(MTMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_mt.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_mt.o
endif
ifeq ($(SUNMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_sun.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_sun.o
endif
ifeq ($(ARCH), FREEBSD-X86)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_fbsd.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_fbsd.o
endif
ifeq ($(NOMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_null.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_null.o
endif
#
@@ -231,46 +258,46 @@
ifneq ($(PIPEKBD), Y)
ifeq ($(TTYKBD), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_tty.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_tty.o
endif
ifeq ($(IPAQKBD), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_ipaq.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_ipaq.o
endif
ifeq ($(ZAURUSKBD),Y)
CFLAGS += -DKBD_ZAURUS=1
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_ttyscan.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_ttyscan.o
endif
ifeq ($(SCANKBD), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_ttyscan.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_ttyscan.o
endif
ifeq ($(ARCH), FREEBSD-X86)
-#MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_fbsd.o
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_tty.o
+#MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_fbsd.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_tty.o
endif
ifeq ($(LIRCKBD), Y)
MW_CORE_OBJS += \
- $(MW_DIR_OBJ)/drivers/mwlirc.o \
- $(MW_DIR_OBJ)/drivers/kbd_lirc.o
+ $(MW_DIR_OBJ)/drivers/keyb/mwlirc.o \
+ $(MW_DIR_OBJ)/drivers/keyb/kbd_lirc.o
endif
ifeq ($(NOKBD), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_null.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_null.o
endif
else
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_pipe.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_pipe.o
endif # PIPEKBD != Y
ifeq ($(ARCH), RTEMS)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_rtems.o
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_rtems.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_rtems.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_rtems.o
endif # RTEMS architecture
@@ -278,8 +305,8 @@
ifeq ($(LIRCKBD2), Y)
MW_CORE_OBJS += \
- $(MW_DIR_OBJ)/drivers/mwlirc.o \
- $(MW_DIR_OBJ)/drivers/kbd_lirc.o
+ $(MW_DIR_OBJ)/drivers/keyb/mwlirc.o \
+ $(MW_DIR_OBJ)/drivers/keyb/kbd_lirc.o
endif
endif # !DJGPP
@@ -291,8 +318,8 @@
MW_CORE_OBJS += \
$(MW_DIR_OBJ)/drivers/scr_djgr.o \
$(MW_DIR_OBJ)/drivers/genfont.o \
- $(MW_DIR_OBJ)/drivers/mou_dos.o \
- $(MW_DIR_OBJ)/drivers/kbd_djgr.o
+ $(MW_DIR_OBJ)/drivers/mouse/mou_dos.o \
+ $(MW_DIR_OBJ)/drivers/keyb/kbd_djgr.o
endif
@@ -331,10 +358,10 @@
endif
ifeq ($(SERMOUSE), Y)
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_ser.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mouse/mou_ser.o
endif
-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_tty.o
+MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/keyb/kbd_tty.o
endif
