From: Keith W. <ke...@us...> - 2003-03-28 13:47:44
|
CVSROOT: /cvsroot/dri Module name: xc Repository: xc/xc/programs/Xserver/hw/xfree86/os-support/vbe/ Changes by: keithw@sc8-pr-cvs1. 03/03/28 05:47:43 Log message: merged from trunk Modified files: xc/xc/programs/Xserver/hw/xfree86/os-support/: Tag: drm-filp-0-1-branch Imakefile xf86OSKbd.h xf86OSmouse.h xf86_ansic.h xf86_libc.h xf86drm.h xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/: Tag: drm-filp-0-1-branch Imakefile alpha_video.c bsd_axp.c bsd_kbd.c bsd_kmod.c bsd_mouse.c ppc_video.c xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/: Tag: drm-filp-0-1-branch ati_pcigart.h drm.h drmP.h drm_agpsupport.h drm_auth.h drm_bufs.h drm_context.h drm_dma.h drm_drawable.h drm_drv.h drm_fops.h drm_init.h drm_ioctl.h drm_lists.h drm_lock.h drm_memory.h drm_os_freebsd.h drm_os_netbsd.h drm_scatter.h drm_sysctl.h drm_vm.h mga_drv.c r128_drv.c radeon_drv.c tdfx_drv.c xc/xc/programs/Xserver/hw/xfree86/os-support/bsdi/: Tag: drm-filp-0-1-branch bsdi_io.c xc/xc/programs/Xserver/hw/xfree86/os-support/bus/: Tag: drm-filp-0-1-branch Imakefile Pci.c Pci.h axpPci.c ia64Pci.c ix86Pci.c linuxPci.c sparcPci.c xf86Pci.h xc/xc/programs/Xserver/hw/xfree86/os-support/dgux/: Tag: drm-filp-0-1-branch dgux_io.c xc/xc/programs/Xserver/hw/xfree86/os-support/hurd/: Tag: drm-filp-0-1-branch hurd_io.c xc/xc/programs/Xserver/hw/xfree86/os-support/linux/: Tag: drm-filp-0-1-branch lnx.h lnx_agp.c lnx_axp.c lnx_ev56.c lnx_kbd.c lnx_pci.c lnx_video.c xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/: Tag: drm-filp-0-1-branch Imakefile xf86drm.c xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/: Tag: drm-filp-0-1-branch Imakefile Makefile.kernel Makefile.linux drmP.h drm_agpsupport.h drm_dma.h drm_drv.h drm_fops.h drm_ioctl.h drm_os_linux.h drm_proc.h gamma_dma.c i810_dma.c i810_drv.h i830.h i830_dma.c i830_drm.h i830_drv.h sis.h sis_mm.c xc/xc/programs/Xserver/hw/xfree86/os-support/lynxos/: Tag: drm-filp-0-1-branch Imakefile lynx_io.c lynx_video.c xc/xc/programs/Xserver/hw/xfree86/os-support/nto/: Tag: drm-filp-0-1-branch nto_io.c xc/xc/programs/Xserver/hw/xfree86/os-support/os2/: Tag: drm-filp-0-1-branch os2_io.c xc/xc/programs/Xserver/hw/xfree86/os-support/pmax/: Tag: drm-filp-0-1-branch pmax_devs.c xc/xc/programs/Xserver/hw/xfree86/os-support/qnx4/: Tag: drm-filp-0-1-branch qnx_io.c xc/xc/programs/Xserver/hw/xfree86/os-support/sco/: Tag: drm-filp-0-1-branch Imakefile sco_init.c sco_io.c sco_mouse.c xc/xc/programs/Xserver/hw/xfree86/os-support/shared/: Tag: drm-filp-0-1-branch kbd.c libc_wrapper.c posix_tty.c xc/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/: Tag: drm-filp-0-1-branch r128_state.c radeon_mem.c xc/xc/programs/Xserver/hw/xfree86/os-support/sunos/: Tag: drm-filp-0-1-branch sun_io.c xc/xc/programs/Xserver/hw/xfree86/os-support/sysv/: Tag: drm-filp-0-1-branch sysv_io.c Added files: xc/xc/programs/Xserver/hw/xfree86/os-support/bus/: Tag: drm-filp-0-1-branch 460gxPCI.c 460gxPCI.h e8870PCI.c e8870PCI.h zx1PCI.c zx1PCI.h xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/: Tag: drm-filp-0-1-branch i830_irq.c xc/xc/programs/Xserver/hw/xfree86/os-support/lynxos/: Tag: drm-filp-0-1-branch lynx_ppc.c Removed files: xc/xc/programs/Xserver/hw/xfree86/os-support/vbe/: Tag: drm-filp-0-1-branch Imakefile vbe.c vbe.h vbeModes.c vbeModes.h vbe_module.c Revision Changes Path 1.9.14.1 +5 -9 xc/xc/programs/Xserver/hw/xfree86/os-support/Imakefile 1.1.1.1.18.1 +5 -5 xc/xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h 1.1.1.11.14.1 +3 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 1.16.4.1 +10 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h 1.14.4.1 +13 -9 xc/xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h 1.26.6.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h 1.10.14.1 +23 -12 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile 1.1.1.1.18.1 +89 -30 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c 1.1.1.1.68.1 +13 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_axp.c 1.1.1.1.18.1 +12 -8 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c 1.2.122.1 +3 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kmod.c 1.1.1.9.14.1 +3 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c 1.1.1.1.18.1 +13 -13 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/ppc_video.c 1.3.2.1 +2 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/ati_pcigart.h 1.11.6.1 +1 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm.h 1.12.2.1 +3 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h 1.5.2.1 +1 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_agpsupport.h 1.4.2.1 +1 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_auth.h 1.4.2.1 +1 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_bufs.h 1.3.2.1 +1 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_context.h 1.11.2.1 +13 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_dma.h 1.2.30.1 +2 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_drawable.h 1.10.2.1 +14 -17 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_drv.h 1.3.2.1 +2 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_fops.h 1.2.30.1 +2 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_init.h 1.3.2.1 +2 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_ioctl.h 1.4.2.1 +2 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_lists.h 1.3.2.1 +2 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_lock.h 1.4.2.1 +4 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_memory.h 1.12.2.1 +11 -5 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h 1.3.2.1 +1 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_netbsd.h 1.4.2.1 +2 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_scatter.h 1.5.2.1 +1 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_sysctl.h 1.4.2.1 +31 -3 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_vm.h 1.3.2.1 +2 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga_drv.c 1.3.2.1 +2 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128_drv.c 1.4.2.1 +30 -26 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon_drv.c 1.3.2.1 +2 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx_drv.c 1.1.1.5.14.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_io.c 1.1.1.12.14.1 +6 -5 xc/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile 1.7.14.1 +26 -13 xc/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c 1.1.1.14.14.1 +20 -11 xc/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h 1.1.1.6.14.1 +369 -57 xc/xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c 1.1.1.1.18.1 +15 -404 xc/xc/programs/Xserver/hw/xfree86/os-support/bus/ia64Pci.c 1.1.1.5.14.1 +11 -10 xc/xc/programs/Xserver/hw/xfree86/os-support/bus/ix86Pci.c 1.1.1.6.14.1 +3 -3 xc/xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c 1.1.1.8.14.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/bus/sparcPci.c 1.7.14.1 +2 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h 1.1.1.4.14.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/dgux/dgux_io.c 1.1.1.6.14.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c 1.1.1.3.96.1 +35 -3 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx.h 1.7.6.1 +1 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c 1.1.1.2.68.1 +89 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c 1.1.1.4.68.1 +61 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c 1.1.1.1.18.1 +12 -8 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 1.7.14.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c 1.8.14.1 +7 -11 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c 1.14.14.1 +1 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/Imakefile 1.42.2.1 +1 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c 1.11.10.1 +1 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Imakefile 1.25.56.1 +5 -5 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel 1.46.4.1 +29 -3 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux 1.57.2.3 +6 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h 1.10.6.1 +6 -6 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_agpsupport.h 1.12.4.3 +1 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_dma.h 1.24.22.2 +5 -5 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_drv.h 1.8.36.2 +6 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_fops.h 1.11.20.1 +44 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_ioctl.h 1.6.2.2 +1 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_os_linux.h 1.6.6.1 +3 -3 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_proc.h 1.17.36.2 +4 -4 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_dma.c 1.39.6.3 +12 -45 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c 1.15.14.2 +28 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h 1.3.22.2 +67 -13 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i830.h 1.11.14.3 +428 -103 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i830_dma.c 1.2.36.1 +92 -8 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i830_drm.h 1.3.14.2 +82 -0 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i830_drv.h 1.5.30.1 +1 -1 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis.h 1.11.56.1 +4 -4 xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_mm.c 1.5.14.1 +4 -3 xc/xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile 1.1.1.5.14.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c 1.1.1.7.86.1 +66 -8 xc/xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c 1.1.1.5.14.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/nto/nto_io.c 1.1.1.5.14.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/os2/os2_io.c 1.1.1.5.14.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/pmax/pmax_devs.c 1.1.1.4.14.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/qnx4/qnx_io.c 1.7.14.1 +4 -4 xc/xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile 1.1.1.5.14.1 +9 -9 xc/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c 1.1.1.5.14.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c 1.1.1.4.62.1 +16 -18 xc/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c 1.1.1.1.18.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/shared/kbd.c 1.18.4.1 +36 -6 xc/xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c 1.1.1.7.14.1 +3 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c 1.4.10.2 +61 -57 xc/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/r128_state.c 1.4.6.2 +6 -6 xc/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_mem.c 1.1.1.2.14.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c 1.1.1.5.14.1 +2 -2 xc/xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c |