diff options
author | brianp <brianp> | 2000-04-18 21:17:27 +0000 |
---|---|---|
committer | brianp <brianp> | 2000-04-18 21:17:27 +0000 |
commit | 0a3e0618e49ea847f196cbff5055ad0dffe3b9be (patch) | |
tree | ed5921d8ef4067fcfca49c8c1944805d1f61a2f4 | |
parent | 50a9382d9ede2223fabd250aa21667a2453c4c50 (diff) |
added xf86LoadKernelModule() and kmod_noop.c stub file
19 files changed, 73 insertions, 35 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile index e4deae416..1a5463273 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile @@ -13,9 +13,9 @@ IOOBJ = inout.o #endif SRCS = am_init.c am_video.c am_io.c mapVT_noop.c ioperm_noop.c \ - VTsw_noop.c $(IOSRC) + VTsw_noop.c $(IOSRC) kmod_noop.c OBJS = am_init.o am_video.o am_io.o mapVT_noop.o ioperm_noop.o \ - VTsw_noop.o $(IOOBJ) + VTsw_noop.o $(IOOBJ) kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) @@ -27,6 +27,7 @@ NormalAsmObjectRule() ObjectFromSpecialSource(mapVT_noop,../shared/mapVT_noop,/**/) ObjectFromSpecialSource(ioperm_noop,../shared/ioperm_noop,/**/) ObjectFromSpecialSource(VTsw_noop,../shared/VTsw_noop,/**/) +ObjectFromSpecialSource(kmod_noop,../shared/kmod_noop,/**/) #if AckToolset ObjectFromSpecialAsmSource(inout,../shared/inout,/**/) #endif diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile index b0ec00a5e..e8cea6ed0 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile @@ -84,12 +84,12 @@ AXP_OBJ=bsd_ev56.o SRCS = bsd_init.c bsd_video.c bsd_io.c bsd_VTsw.c \ libc_wrapper.c $(IOPERM_SRC) std_kbdEv.c posix_tty.c $(MOUSESRC) \ $(RES_SRC) stdPci.c vidmem.c $(JOYSTICK_SRC) sigio.c $(APMSRC) \ - $(AXP_SRC) + $(AXP_SRC) kmod_noop.c OBJS = bsd_init.o bsd_video.o bsd_io.o bsd_VTsw.o \ libc_wrapper.o $(IOPERM_OBJ) std_kbdEv.o posix_tty.o $(MOUSEOBJ) \ $(RES_OBJ) stdPci.o vidmem.o $(JOYSTICK_OBJ) sigio.o $(APMOBJ) \ - $(AXP_OBJ) + $(AXP_OBJ) kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/mi -I$(APINCLUDES) \ @@ -136,6 +136,7 @@ LinkSourceFile(stdResource.c,../shared) LinkSourceFile(stdPci.c,../shared) LinkSourceFile(vidmem.c,../shared) LinkSourceFile(sigio.c,../shared) +LinkSourceFile(kmod_noop.c,../shared) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile index 6d1d879e4..d51e6183c 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile @@ -12,11 +12,13 @@ MOUSEOBJ = bsdi_mouse.o SRCS = bsdi_init.c bsdi_video.c bsdi_io.c bios_devmem.c \ mapVT_noop.c VTsw_noop.c std_kbdEv.c posix_tty.c $(MOUSESRC) \ - libc_wrapper.c stdResource.c stdPci.c sigiostubs.c pm_noop.c + libc_wrapper.c stdResource.c stdPci.c sigiostubs.c pm_noop.c \ + kmod_noop.c OBJS = bsdi_init.o bsdi_video.o bsdi_io.o bios_devmem.o \ mapVT_noop.o VTsw_noop.o std_kbdEv.o posix_tty.o $(MOUSEOBJ) \ - libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o + libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o \ + kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) -I$(EXTINCSRC) @@ -38,6 +40,7 @@ LinkSourceFile(stdResource.c,../shared) LinkSourceFile(stdPci.c,../shared) LinkSourceFile(sigiostubs.c,../shared) LinkSourceFile(pm_noop.c,../shared) +LinkSourceFile(kmod_noop.c,../shared) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/dgux/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/dgux/Imakefile index 677c2992d..49fb043d9 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/dgux/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/dgux/Imakefile @@ -5,11 +5,11 @@ BIOS_MOD = bios_DGmmap SRCS = dgux_init.c dgux_video.c IO_utils.c dgux_io.c $(BIOS_MOD).c VTsw_noop.c \ dgux_kbd.c dgux_kbdEv.c dgux_tty.c std_mouse.c std_mseEv.c \ - stdResource.c stdPci.c sigiostubs.c pm_noop.c + stdResource.c stdPci.c sigiostubs.c pm_noop.c kmod_noop.c OBJS = dgux_init.o dgux_video.o IO_utils.o dgux_io.o $(BIOS_MOD).o VTsw_noop.o \ dgux_kbd.o dgux_kbdEv.o dgux_tty.o std_mouse.o std_mseEv.o \ - stdResource.o stdPci.o sigiostubs.o pm_noop.o + stdResource.o stdPci.o sigiostubs.o pm_noop.o kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) -I$(EXTINCSRC) @@ -29,5 +29,6 @@ LinkSourceFile(stdResource.c,../shared) LinkSourceFile(stdPci.c,../shared) LinkSourceFile(sigiostubs.c,../shared) LinkSourceFile(pm_noop.c,../shared) +LinkSourceFile(kmod_noop.c,../shared) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile index fed41ff72..ce5c27bfa 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile @@ -9,11 +9,11 @@ MOUSEOBJ = hurd_mouse.o SRCS = hurd_init.c hurd_video.c hurd_io.c libc_wrapper.c $(BIOS_MOD).c \ mapVT_noop.c VTsw_noop.c posix_tty.c std_kbdEv.c $(MOUSESRC) \ - stdResource.c stdPci.c sigiostubs.c pm_noop.c + stdResource.c stdPci.c sigiostubs.c pm_noop.c kmod_noop.c OBJS = hurd_init.o hurd_video.o hurd_io.o libc_wrapper.o $(BIOS_MOD).o \ mapVT_noop.o VTsw_noop.o posix_tty.o std_kbdEv.o $(MOUSEOBJ) \ - stdResource.o stdPci.o sigiostubs.o pm_noop.o + stdResource.o stdPci.o sigiostubs.o pm_noop.o kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/mi @@ -35,6 +35,7 @@ LinkSourceFile(stdResource.c,../shared) LinkSourceFile(stdPci.c,../shared) LinkSourceFile(sigiostubs.c,../shared) LinkSourceFile(pm_noop.c,../shared) +LinkSourceFile(kmod_noop.c,../shared) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile index 8a9458ef2..ed314b993 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile @@ -42,12 +42,12 @@ AXP_OBJ=lnx_ev56.o SRCS = lnx_init.c lnx_video.c lnx_io.c libc_wrapper.c bios_mmap.c \ mapVT_noop.c VTsw_usl.c std_kbdEv.c posix_tty.c $(MOUSESRC) \ lnx_pci.c vidmem.c lnx_apm.c $(JOYSTICK_SRC) $(DRI_SRC) $(RES_SRCS) \ - $(AXP_SRC) + $(AXP_SRC) lnx_kmod.c OBJS = lnx_init.o lnx_video.o lnx_io.o libc_wrapper.o bios_mmap.o \ mapVT_noop.o VTsw_usl.o std_kbdEv.o posix_tty.o $(MOUSEOBJ) \ lnx_pci.o vidmem.o lnx_apm.o $(JOYSTICK_OBJ) $(DRI_OBJ) $(RES_OBJS) \ - $(AXP_OBJ) + $(AXP_OBJ) lnx_kmod.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) -I$(EXTINCSRC) @@ -100,6 +100,7 @@ LinkSourceFile(posix_tty.c,../shared) LinkSourceFile(libc_wrapper.c,../shared) LinkSourceFile(vidmem.c,../shared) LinkSourceFile(VTsw_usl.c,../shared) +LinkSourceFile(kmod_noop.c,../shared) LinkSourceFile($(DRI_SRC),../shared) diff --git a/xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile index 6c91ffbfc..36013ddb4 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile @@ -20,12 +20,12 @@ MOUSEOBJ = lynx_mouse.o SRCS = lynx_init.c lynx_video.c lynx_io.c lynx_mmap.c mapVT_noop.c \ VTsw_usl.c std_kbdEv.c posix_tty.c $(MOUSESRC) \ $(IOPERM_SRCS) $(PPC_SRCS) libc_wrapper.c stdResource.c stdPci.c \ - vidmem.c sigio.c pm_noop.c + vidmem.c sigio.c pm_noop.c kmod_noop.c OBJS = lynx_init.o lynx_video.o lynx_io.o lynx_mmap.o mapVT_noop.o \ VTsw_usl.o std_kbdEv.o posix_tty.o $(MOUSEOBJ) \ $(IOPERM_OBJS) $(PPC_OBJS) libc_wrapper.o stdResource.o stdPci.o \ - vidmem.o sigio.o pm_noop.o + vidmem.o sigio.o pm_noop.o kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) -I$(EXTINCSRC) @@ -50,5 +50,6 @@ LinkSourceFile(stdPci.c,../shared) LinkSourceFile(vidmem.c,../shared) LinkSourceFile(sigio.c,../shared) LinkSourceFile(pm_noop.c,../shared) +LinkSourceFile(kmod_noop.c,../shared) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile index 01f2843fc..19bc8517a 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile @@ -14,10 +14,10 @@ BIOS_MOD = bios_mmap #endif SRCS = mach_init.c mach_video.c mach_io.c $(BIOS_MOD).c mapVT_noop.c \ - VTsw_noop.c + VTsw_noop.c kmod_noop.c OBJS = mach_init.o mach_video.o mach_io.o $(BIOS_MOD).o mapVT_noop.o \ - VTsw_noop.o + VTsw_noop.o kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) @@ -30,6 +30,7 @@ ObjectFromSpecialSource(bios_devmem,../shared/bios_devmem,/**/) #endif ObjectFromSpecialSource(mapVT_noop,../shared/mapVT_noop,/**/) ObjectFromSpecialSource(VTsw_noop,../shared/VTsw_noop,/**/) +ObjectFromSpecialSource(kmod_noop,../shared/kmod_noop,/**/) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile index 5022a0ce6..5d0f0f964 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile @@ -9,10 +9,10 @@ XCOMM $XConsortium: Imakefile /main/5 1996/09/28 17:24:04 rws $ #include <Server.tmpl> SRCS = mnx_init.c mnx_video.c mnx_io.c bios_devmem.c mapVT_noop.c \ - ioperm_noop.c VTsw_noop.c std_mouse.c posix_tty.c + ioperm_noop.c VTsw_noop.c std_mouse.c posix_tty.c kmod_noop.c OBJS = mnx_init.o mnx_video.o mnx_io.o bios_devmem.o mapVT_noop.o \ - ioperm_noop.o VTsw_noop.o posix_tty.o + ioperm_noop.o VTsw_noop.o posix_tty.o kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) @@ -25,5 +25,6 @@ ObjectFromSpecialSource(mapVT_noop,../shared/mapVT_noop,/**/) ObjectFromSpecialSource(ioperm_noop,../shared/ioperm_noop,/**/) ObjectFromSpecialSource(VTsw_noop,../shared/VTsw_noop,/**/) ObjectFromSpecialSource(posix_tty,../shared/posix_tty,/**/) +ObjectFromSpecialSource(kmod_noop,../shared/kmod_noop,/**/) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/nto/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/nto/Imakefile index 078406136..74e3eea12 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/nto/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/nto/Imakefile @@ -5,10 +5,10 @@ XCOMM SRCS = nto_io.c nto_init.c nto_kbdEv.c mapVT_noop.c nto_ioperm.c nto_video.c \ - VTsw_noop.c posix_tty.c std_mseEv.c std_mouse.c + VTsw_noop.c posix_tty.c std_mseEv.c std_mouse.c kmod_noop.c OBJS = nto_io.o nto_init.o nto_kbdEv.o mapVT_noop.o nto_ioperm.o nto_video.o \ - VTsw_noop.o posix_tty.o std_mseEv.o std_mouse.o + VTsw_noop.o posix_tty.o std_mseEv.o std_mouse.o kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) @@ -23,5 +23,6 @@ ObjectFromSpecialSource(VTsw_noop,../shared/VTsw_noop,/**/) ObjectFromSpecialSource(posix_tty,../shared/posix_tty,/**/) ObjectFromSpecialSource(std_mseEv,../shared/std_mseEv,/**/) ObjectFromSpecialSource(std_mouse,../shared/std_mouse,/**/) +ObjectFromSpecialSource(kmod_noop,../shared/kmod_noop,/**/) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/os2/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/os2/Imakefile index 0e17f9146..806a98585 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/os2/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/os2/Imakefile @@ -12,12 +12,12 @@ BIOS_MOD = os2_bios SRCS = os2_init.c os2_video.c os2_io.c $(BIOS_MOD).c mapVT_noop.c \ os2_ioperm.c os2_VTsw.c os2_mouse.c os2_KbdEv.c os2_stubs.c \ os2_select.c os2_diag.c libc_wrapper.c stdResource.c stdPci.c \ - vidmem.c sigiostubs.c pm_noop.c + vidmem.c sigiostubs.c pm_noop.c kmod_noop.c OBJS = os2_init.o os2_video.o os2_io.o $(BIOS_MOD).o mapVT_noop.o \ os2_ioperm.o os2_VTsw.o os2_mouse.o os2_kbdEv.o os2_stubs.o \ os2_select.o os2_diag.o libc_wrapper.o stdResource.o stdPci.o \ - vidmem.o sigiostubs.o pm_noop.o + vidmem.o sigiostubs.o pm_noop.o kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) @@ -38,5 +38,6 @@ LinkSourceFile(stdPci.c,../shared) LinkSourceFile(vidmem.c,../shared) LinkSourceFile(sigiostubs.c,../shared) LinkSourceFile(pm_noop.c,../shared) +LinkSourceFile(kmod_noop.c,../shared) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/pmax/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/pmax/Imakefile index 00be6f4c6..fe69c7231 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/pmax/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/pmax/Imakefile @@ -9,12 +9,15 @@ MOUSEOBJ = pmax_mouse.o SRCS = pmax_devs.c pmax_init.c pmax_map.c pmax_pci.c pmax_ppc.c \ bios_V4mmap.c VTsw_usl.c sysv_kbd.c std_kbdEv.c \ posix_tty.c $(MOUSESRC) xqueue.c ioperm_noop.c \ - libc_wrapper.c stdResource.c stdPci.o sigiostubs.c pm_noop.c + libc_wrapper.c stdResource.c stdPci.o sigiostubs.c pm_noop.c \ + kmod_noop.c OBJS = pmax_devs.o pmax_init.o pmax_map.o pmax_pci.o pmax_ppc.o \ bios_V4mmap.o VTsw_usl.o sysv_kbd.o std_kbdEv.o \ posix_tty.o $(MOUSESRC) xqueue.o ioperm_noop.o \ - libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o + libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o \ + kmod_noop.o + INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86OSSRC)/bus -I. \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I../sysv @@ -36,6 +39,7 @@ LinkSourceFile(stdResource.c,../shared) LinkSourceFile(stdPci.c,../shared) LinkSourceFile(sigiostubs.c,../shared) LinkSourceFile(pm_noop.c,../shared) +LinkSourceFile(kmod_noop.c,../shared) LinkSourceFile(bios_V4mmap.c,../sysv) LinkSourceFile(xqueue.c,../sysv) diff --git a/xc/programs/Xserver/hw/xfree86/os-support/qnx4/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/qnx4/Imakefile index 712ff178f..d6cbd6223 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/qnx4/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/qnx4/Imakefile @@ -7,11 +7,13 @@ XCOMM SRCS = qnx_io.c qnx_init.c qnx_utils.c mapVT_noop.c ioperm_noop.c qnx_video.c \ qnx_VTsw.c qnx_kbd.c posix_tty.c qnx_mouse.c qnx_select.c \ - libc_wrapper.c stdResource.c stdPci.c sigiostubs.c pm_noop.c + libc_wrapper.c stdResource.c stdPci.c sigiostubs.c pm_noop.c \ + kmod_noop.c OBJS = qnx_io.o qnx_init.o qnx_utils.o mapVT_noop.o ioperm_noop.o qnx_video.o \ qnx_VTsw.o qnx_kbd.o posix_tty.o qnx_mouse.o qnx_select.o \ - libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o + libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o \ + kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) @@ -32,5 +34,6 @@ LinkSourceFile(stdResource.c,../shared) LinkSourceFile(stdPci.c,../shared) LinkSourceFile(sigiostubs.c,../shared) LinkSourceFile(pm_noop.c,../shared) +LinkSourceFile(kmod_noop.c,../shared) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile index 3db9b9f3c..619dcb008 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile @@ -9,11 +9,13 @@ XCOMM $XConsortium: Imakefile /main/4 1996/09/28 17:24:25 rws $ SRCS = sco_init.c sco_video.c sco_io.c bios_devmem.c mapVT_noop.c VTsw_sco.c \ sysv_kbd.c std_kbdEv.c sysv_tty.c std_mseEv.c sco_mouse.c \ - libc_wrapper.c stdResource.c stdPci.o sigiostubs.c pm_noop.c + libc_wrapper.c stdResource.c stdPci.o sigiostubs.c pm_noop.c \ + kmod_noop.c OBJS = sco_init.o sco_video.o sco_io.o bios_devmem.o mapVT_noop.o VTsw_sco.o \ sysv_kbd.o std_kbdEv.o sysv_tty.o std_mseEv.o sco_mouse.o \ - libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o + libc_wrapper.o stdResource.o stdPci.o sigiostubs.o pm_noop.o \ + kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) @@ -36,6 +38,7 @@ LinkSourceFile(stdResource.c,../shared) LinkSourceFile(stdPci.c,../shared) LinkSourceFile(sigiostubs.c,../shared) LinkSourceFile(pm_noop.c,../shared) +LinkSourceFile(kmod_noop.c,../shared) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/kmod_noop.c b/xc/programs/Xserver/hw/xfree86/os-support/shared/kmod_noop.c new file mode 100644 index 000000000..80f487593 --- /dev/null +++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/kmod_noop.c @@ -0,0 +1,8 @@ + +#include "xf86_OSproc.h" + +int xf86LoadKernelModule(const char *pathname) +{ + (void) pathname; + return 0; /* failure */ +} diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sol8_x86/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/sol8_x86/Imakefile index 16f465ff4..0ac6d3044 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/sol8_x86/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/sol8_x86/Imakefile @@ -19,12 +19,14 @@ MOUSEOBJ = sol8_mouse.o SRCS = sol8_init.c sol8_vid.c sol8_bios.c sol8_kbd.c sol8_io.c \ VTsw_noop.c sol8_kbd.c sol8_kbdEv.c posix_tty.c $(MOUSESRC) \ libc_wrapper.c $(PROWORKS_INOUT_SRC) stdResource.c stdPci.c \ - sol8_kbdgetmapping.c sol8_postkbdevents.c sigiostubs.c pm_noop.c + sol8_kbdgetmapping.c sol8_postkbdevents.c sigiostubs.c pm_noop.c \ + kmod_noop.c OBJS = sol8_init.o sol8_vid.o sol8_bios.o sol8_kbd.o sol8_io.o \ VTsw_noop.o sol8_kbd.o sol8_kbdEv.o posix_tty.o $(MOUSEOBJ) \ libc_wrapper.o $(PROWORKS_INOUT_OBJ) stdResource.o stdPci.o \ - sol8_kbdgetmapping.o sol8_postkbdevents.o sigiostubs.o pm_noop.o + sol8_kbdgetmapping.o sol8_postkbdevents.o sigiostubs.o pm_noop.o \ + kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) -I$(EXTINCSRC) @@ -44,5 +46,6 @@ LinkSourceFile(stdResource.c,../shared) LinkSourceFile(stdPci.c,../shared) LinkSourceFile(sigiostubs.c,../shared) LinkSourceFile(pm_noop.c,../shared) +LinkSourceFile(kmod_noop.c,../shared) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile index 0571a3e43..970351ced 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile @@ -19,12 +19,12 @@ MOUSEOBJ = solx86_mouse.o SRCS = solx86_init.c solx86_vid.c solx86_bios.c sysv_io.c \ VTsw_usl.c sysv_kbd.c std_kbdEv.c posix_tty.c $(MOUSESRC) \ libc_wrapper.c $(PROWORKS_INOUT_SRC) stdResource.c stdPci.c \ - sigiostubs.c pm_noop.c + sigiostubs.c pm_noop.c kmod_noop.c OBJS = solx86_init.o solx86_vid.o solx86_bios.o sysv_io.o \ VTsw_usl.o sysv_kbd.o std_kbdEv.o posix_tty.o $(MOUSEOBJ) \ libc_wrapper.o $(PROWORKS_INOUT_OBJ) stdResource.o stdPci.o \ - sigiostubs.o pm_noop.o + sigiostubs.o pm_noop.o kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) -I$(EXTINCSRC) @@ -47,5 +47,6 @@ LinkSourceFile(stdResource.c,../shared) LinkSourceFile(stdPci.c,../shared) LinkSourceFile(sigiostubs.c,../shared) LinkSourceFile(pm_noop.c,../shared) +LinkSourceFile(kmod_noop.c,../shared) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile index 0f9d7042a..ca5c6134a 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile @@ -19,11 +19,13 @@ MOUSEOBJ = sysv_mouse.o SRCS = sysv_init.c sysv_video.c sysv_io.c $(BIOS_MOD).c VTsw_usl.c \ sysv_kbd.c std_kbdEv.c posix_tty.c $(MOUSESRC) xqueue.c \ - libc_wrapper.c stdResource.c stdPci.c vidmem.c sigiostubs.c pm_noop.c + libc_wrapper.c stdResource.c stdPci.c vidmem.c sigiostubs.c pm_noop.c \ + kmod_noop.c OBJS = sysv_init.o sysv_video.o sysv_io.o $(BIOS_MOD).o VTsw_usl.o \ sysv_kbd.o std_kbdEv.o posix_tty.o $(MOUSEOBJ) xqueue.o \ - libc_wrapper.o stdResource.o stdPci.o vidmem.o sigiostubs.o pm_noop.o + libc_wrapper.o stdResource.o stdPci.o vidmem.o sigiostubs.o pm_noop.o \ + kmod_noop.o INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/mi @@ -50,5 +52,6 @@ LinkSourceFile(stdPci.c,../shared) LinkSourceFile(vidmem.c,../shared) LinkSourceFile(sigiostubs.c,../shared) LinkSourceFile(pm_noop.c,../shared) +LinkSourceFile(kmod_noop.c,../shared) DependTarget() diff --git a/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h b/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h index 092cead2f..d190da8f6 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h +++ b/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h @@ -164,7 +164,7 @@ extern int xf86SetSerialModemState(int fd, int state); extern int xf86GetSerialModemState(int fd); extern int xf86SerialModemSetBits(int fd, int bits); extern int xf86SerialModemClearBits(int fd, int bits); - +extern int xf86LoadKernelModule(const char *pathname); #if defined(__alpha__) /* entry points for Mmio memory access routines */ |