CVS commit: xsrc/external/mit/xf86-video-ati/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 06:31:54 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-video-ati/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11793 Log Message: initial import of xf86-video-ati-6.13.1 Status: Vendor Tag: xorg Release Tags: xf86-video-ati-6-13-1 U xsrc/external/mit/xf86-video-ati/dist/COPYING U xsrc/external/mit/xf86-video-ati/dist/install-sh U xsrc/external/mit/xf86-video-ati/dist/config.h.in U xsrc/external/mit/xf86-video-ati/dist/README U xsrc/external/mit/xf86-video-ati/dist/INSTALL U xsrc/external/mit/xf86-video-ati/dist/config.sub U xsrc/external/mit/xf86-video-ati/dist/Makefile.am U xsrc/external/mit/xf86-video-ati/dist/ChangeLog U xsrc/external/mit/xf86-video-ati/dist/ltmain.sh U xsrc/external/mit/xf86-video-ati/dist/Makefile.in U xsrc/external/mit/xf86-video-ati/dist/missing U xsrc/external/mit/xf86-video-ati/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ati/dist/configure.ac U xsrc/external/mit/xf86-video-ati/dist/depcomp U xsrc/external/mit/xf86-video-ati/dist/configure U xsrc/external/mit/xf86-video-ati/dist/config.guess U xsrc/external/mit/xf86-video-ati/dist/src/radeon_mm_i2c.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_tv.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_macros.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c U xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_vip.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_render.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre200.c U xsrc/external/mit/xf86-video-ati/dist/src/bicubic_table.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_vbo.h U xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_atomwrapper.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri2.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_state.h U xsrc/external/mit/xf86-video-ati/dist/src/Makefile.am U xsrc/external/mit/xf86-video-ati/dist/src/ati.h U xsrc/external/mit/xf86-video-ati/dist/src/ati.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/simple_list.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c U xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_drm.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h U xsrc/external/mit/xf86-video-ati/dist/src/theatre_module.c U xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_atomwrapper.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_pci_chipset_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_dummy_bufmgr.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_render.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_commonfuncs.c C xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_misc.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_legacy_memory.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c C xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c U xsrc/external/mit/xf86-video-ati/dist/src/atimodule.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.h U xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_accelfuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon.h U xsrc/external/mit/xf86-video-ati/dist/src/theatre200.h U xsrc/external/mit/xf86-video-ati/dist/src/generic_bus.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipset_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_auto_r6xx.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_output.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre200_module.c U xsrc/external/mit/xf86-video-ati/dist/src/ati_pciids_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri2.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.h U xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_pm.c U
CVS commit: xsrc/external/mit/xf86-video-neomagic/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 06:31:58 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-video-neomagic/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1525 Log Message: initial import of xf86-video-neomagic-1.2.5 Status: Vendor Tag: xorg Release Tags: xf86-video-neomagic-1-2-5 U xsrc/external/mit/xf86-video-neomagic/dist/COPYING U xsrc/external/mit/xf86-video-neomagic/dist/install-sh U xsrc/external/mit/xf86-video-neomagic/dist/config.h.in U xsrc/external/mit/xf86-video-neomagic/dist/README N xsrc/external/mit/xf86-video-neomagic/dist/INSTALL U xsrc/external/mit/xf86-video-neomagic/dist/config.sub U xsrc/external/mit/xf86-video-neomagic/dist/TODO U xsrc/external/mit/xf86-video-neomagic/dist/Makefile.am U xsrc/external/mit/xf86-video-neomagic/dist/ChangeLog U xsrc/external/mit/xf86-video-neomagic/dist/ltmain.sh U xsrc/external/mit/xf86-video-neomagic/dist/Makefile.in U xsrc/external/mit/xf86-video-neomagic/dist/missing U xsrc/external/mit/xf86-video-neomagic/dist/aclocal.m4 U xsrc/external/mit/xf86-video-neomagic/dist/configure.ac U xsrc/external/mit/xf86-video-neomagic/dist/depcomp U xsrc/external/mit/xf86-video-neomagic/dist/configure U xsrc/external/mit/xf86-video-neomagic/dist/NM-reg.txt U xsrc/external/mit/xf86-video-neomagic/dist/config.guess U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_pcirename.h U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_cursor.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_video.h U xsrc/external/mit/xf86-video-neomagic/dist/src/neo.h U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2090.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_dga.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_reg.h U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_i2c.c U xsrc/external/mit/xf86-video-neomagic/dist/src/Makefile.am U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_video.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_shadow.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2070.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_macros.h U xsrc/external/mit/xf86-video-neomagic/dist/src/Makefile.in U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2097.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_driver.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2200.c U xsrc/external/mit/xf86-video-neomagic/dist/man/Makefile.am U xsrc/external/mit/xf86-video-neomagic/dist/man/Makefile.in U xsrc/external/mit/xf86-video-neomagic/dist/man/neomagic.man No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-rendition/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 06:32:03 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-video-rendition/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12353 Log Message: initial import of xf86-video-rendition-4.2.4 Status: Vendor Tag: xorg Release Tags: xf86-video-rendition-4-2-4 U xsrc/external/mit/xf86-video-rendition/dist/COPYING U xsrc/external/mit/xf86-video-rendition/dist/install-sh U xsrc/external/mit/xf86-video-rendition/dist/config.h.in U xsrc/external/mit/xf86-video-rendition/dist/README N xsrc/external/mit/xf86-video-rendition/dist/INSTALL U xsrc/external/mit/xf86-video-rendition/dist/config.sub U xsrc/external/mit/xf86-video-rendition/dist/Makefile.am U xsrc/external/mit/xf86-video-rendition/dist/ChangeLog U xsrc/external/mit/xf86-video-rendition/dist/ltmain.sh U xsrc/external/mit/xf86-video-rendition/dist/Makefile.in U xsrc/external/mit/xf86-video-rendition/dist/missing U xsrc/external/mit/xf86-video-rendition/dist/aclocal.m4 U xsrc/external/mit/xf86-video-rendition/dist/configure.ac U xsrc/external/mit/xf86-video-rendition/dist/depcomp U xsrc/external/mit/xf86-video-rendition/dist/configure U xsrc/external/mit/xf86-video-rendition/dist/config.guess U xsrc/external/mit/xf86-video-rendition/dist/src/v10002d.uc U xsrc/external/mit/xf86-video-rendition/dist/src/vboard.c U xsrc/external/mit/xf86-video-rendition/dist/src/vmisc.h U xsrc/external/mit/xf86-video-rendition/dist/src/rendition_shadow.h U xsrc/external/mit/xf86-video-rendition/dist/src/accel.h U xsrc/external/mit/xf86-video-rendition/dist/src/vloaduc.h U xsrc/external/mit/xf86-video-rendition/dist/src/vboard.h U xsrc/external/mit/xf86-video-rendition/dist/src/v1krisc.c U xsrc/external/mit/xf86-video-rendition/dist/src/rendition_shadow.c U xsrc/external/mit/xf86-video-rendition/dist/src/v2kregs.h U xsrc/external/mit/xf86-video-rendition/dist/src/vramdac.h U xsrc/external/mit/xf86-video-rendition/dist/src/README.uc U xsrc/external/mit/xf86-video-rendition/dist/src/vmodes.c U xsrc/external/mit/xf86-video-rendition/dist/src/hwcursor.h U xsrc/external/mit/xf86-video-rendition/dist/src/Makefile.am U xsrc/external/mit/xf86-video-rendition/dist/src/v20002d.uc U xsrc/external/mit/xf86-video-rendition/dist/src/vgafont-std.data U xsrc/external/mit/xf86-video-rendition/dist/src/vmisc.c U xsrc/external/mit/xf86-video-rendition/dist/src/vos.h U xsrc/external/mit/xf86-video-rendition/dist/src/vtypes.h U xsrc/external/mit/xf86-video-rendition/dist/src/vramdac.c U xsrc/external/mit/xf86-video-rendition/dist/src/Makefile.in U xsrc/external/mit/xf86-video-rendition/dist/src/vgapalette.data U xsrc/external/mit/xf86-video-rendition/dist/src/vmodes.h U xsrc/external/mit/xf86-video-rendition/dist/src/rendition_options.h U xsrc/external/mit/xf86-video-rendition/dist/src/v1krisc.h U xsrc/external/mit/xf86-video-rendition/dist/src/vgafont-vrx.data U xsrc/external/mit/xf86-video-rendition/dist/src/cmd2d.h U xsrc/external/mit/xf86-video-rendition/dist/src/commonregs.h U xsrc/external/mit/xf86-video-rendition/dist/src/rendition.c U xsrc/external/mit/xf86-video-rendition/dist/src/vloaduc.c U xsrc/external/mit/xf86-video-rendition/dist/src/hwcursor.c U xsrc/external/mit/xf86-video-rendition/dist/src/cscode.h U xsrc/external/mit/xf86-video-rendition/dist/src/v1kregs.h U xsrc/external/mit/xf86-video-rendition/dist/src/accelX.c U xsrc/external/mit/xf86-video-rendition/dist/src/rendition.h U xsrc/external/mit/xf86-video-rendition/dist/man/rendition.man U xsrc/external/mit/xf86-video-rendition/dist/man/Makefile.am U xsrc/external/mit/xf86-video-rendition/dist/man/Makefile.in No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-sis/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 06:32:09 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-video-sis/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23402 Log Message: initial import of xf86-video-sis-0.10.3 Status: Vendor Tag: xorg Release Tags: xf86-video-sis-0-10-3 U xsrc/external/mit/xf86-video-sis/dist/COPYING U xsrc/external/mit/xf86-video-sis/dist/install-sh U xsrc/external/mit/xf86-video-sis/dist/config.h.in U xsrc/external/mit/xf86-video-sis/dist/README N xsrc/external/mit/xf86-video-sis/dist/INSTALL U xsrc/external/mit/xf86-video-sis/dist/config.sub U xsrc/external/mit/xf86-video-sis/dist/Makefile.am U xsrc/external/mit/xf86-video-sis/dist/ChangeLog U xsrc/external/mit/xf86-video-sis/dist/ltmain.sh U xsrc/external/mit/xf86-video-sis/dist/Makefile.in U xsrc/external/mit/xf86-video-sis/dist/missing U xsrc/external/mit/xf86-video-sis/dist/aclocal.m4 U xsrc/external/mit/xf86-video-sis/dist/configure.ac U xsrc/external/mit/xf86-video-sis/dist/depcomp U xsrc/external/mit/xf86-video-sis/dist/configure U xsrc/external/mit/xf86-video-sis/dist/config.guess U xsrc/external/mit/xf86-video-sis/dist/src/sispcirename.h U xsrc/external/mit/xf86-video-sis/dist/src/osdef.h U xsrc/external/mit/xf86-video-sis/dist/src/310vtbl.h U xsrc/external/mit/xf86-video-sis/dist/src/oem300.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.h U xsrc/external/mit/xf86-video-sis/dist/src/initextx.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.h U xsrc/external/mit/xf86-video-sis/dist/src/300vtbl.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_videostr.h U xsrc/external/mit/xf86-video-sis/dist/src/vstruct.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.c U xsrc/external/mit/xf86-video-sis/dist/src/init301.h U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.am U xsrc/external/mit/xf86-video-sis/dist/src/sis_vb.c U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.h U xsrc/external/mit/xf86-video-sis/dist/src/init301.c U xsrc/external/mit/xf86-video-sis/dist/src/sis6326_video.c U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_regs.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_opt.c U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.in U xsrc/external/mit/xf86-video-sis/dist/src/sis_common.h U xsrc/external/mit/xf86-video-sis/dist/src/initextx.c U xsrc/external/mit/xf86-video-sis/dist/src/sis.h U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.c U xsrc/external/mit/xf86-video-sis/dist/src/vgatypes.h U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_dga.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_setup.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.h U xsrc/external/mit/xf86-video-sis/dist/src/init.c U xsrc/external/mit/xf86-video-sis/dist/src/oem310.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_memcpy.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c U xsrc/external/mit/xf86-video-sis/dist/src/init.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_shadow.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.h U xsrc/external/mit/xf86-video-sis/dist/src/initdef.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_vga.c U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.am U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.in U xsrc/external/mit/xf86-video-sis/dist/man/sis.man No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-trident/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 06:32:13 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-video-trident/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14403 Log Message: initial import of xf86-video-trident-1.3.4 Status: Vendor Tag: xorg Release Tags: xf86-video-trident-1-3-4 U xsrc/external/mit/xf86-video-trident/dist/COPYING U xsrc/external/mit/xf86-video-trident/dist/install-sh U xsrc/external/mit/xf86-video-trident/dist/config.h.in U xsrc/external/mit/xf86-video-trident/dist/README N xsrc/external/mit/xf86-video-trident/dist/INSTALL U xsrc/external/mit/xf86-video-trident/dist/config.sub U xsrc/external/mit/xf86-video-trident/dist/Makefile.am U xsrc/external/mit/xf86-video-trident/dist/ChangeLog U xsrc/external/mit/xf86-video-trident/dist/ltmain.sh U xsrc/external/mit/xf86-video-trident/dist/Makefile.in U xsrc/external/mit/xf86-video-trident/dist/missing U xsrc/external/mit/xf86-video-trident/dist/aclocal.m4 U xsrc/external/mit/xf86-video-trident/dist/configure.ac U xsrc/external/mit/xf86-video-trident/dist/depcomp U xsrc/external/mit/xf86-video-trident/dist/configure U xsrc/external/mit/xf86-video-trident/dist/config.guess U xsrc/external/mit/xf86-video-trident/dist/src/blade_accel_exa.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_regs.h U xsrc/external/mit/xf86-video-trident/dist/src/blade_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_shadow.c U xsrc/external/mit/xf86-video-trident/dist/src/xp4_accel_exa.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_driver.c U xsrc/external/mit/xf86-video-trident/dist/src/tridentpcirename.h U xsrc/external/mit/xf86-video-trident/dist/src/trident_dga.c U xsrc/external/mit/xf86-video-trident/dist/src/Makefile.am U xsrc/external/mit/xf86-video-trident/dist/src/tridenthelper.c U xsrc/external/mit/xf86-video-trident/dist/src/tvga_dac.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_dac.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_bank.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_tv.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_i2c.c U xsrc/external/mit/xf86-video-trident/dist/src/Makefile.in U xsrc/external/mit/xf86-video-trident/dist/src/xp_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/xp4_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_video.c U xsrc/external/mit/xf86-video-trident/dist/src/image_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/trident.h U xsrc/external/mit/xf86-video-trident/dist/man/trident.man U xsrc/external/mit/xf86-video-trident/dist/man/Makefile.am U xsrc/external/mit/xf86-video-trident/dist/man/Makefile.in No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-tseng/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 06:32:17 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-video-tseng/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21736 Log Message: initial import of xf86-video-tseng-1.2.4 Status: Vendor Tag: xorg Release Tags: xf86-video-tseng-1-2-4 U xsrc/external/mit/xf86-video-tseng/dist/COPYING U xsrc/external/mit/xf86-video-tseng/dist/install-sh U xsrc/external/mit/xf86-video-tseng/dist/config.h.in U xsrc/external/mit/xf86-video-tseng/dist/README N xsrc/external/mit/xf86-video-tseng/dist/INSTALL U xsrc/external/mit/xf86-video-tseng/dist/config.sub U xsrc/external/mit/xf86-video-tseng/dist/Makefile.am U xsrc/external/mit/xf86-video-tseng/dist/ChangeLog U xsrc/external/mit/xf86-video-tseng/dist/ltmain.sh U xsrc/external/mit/xf86-video-tseng/dist/Makefile.in U xsrc/external/mit/xf86-video-tseng/dist/missing U xsrc/external/mit/xf86-video-tseng/dist/aclocal.m4 U xsrc/external/mit/xf86-video-tseng/dist/configure.ac U xsrc/external/mit/xf86-video-tseng/dist/depcomp U xsrc/external/mit/xf86-video-tseng/dist/configure U xsrc/external/mit/xf86-video-tseng/dist/config.guess U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_driver.c U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_dga.c U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_accel.c U xsrc/external/mit/xf86-video-tseng/dist/src/README U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_pcirename.h U xsrc/external/mit/xf86-video-tseng/dist/src/Makefile.am U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_cursor.c U xsrc/external/mit/xf86-video-tseng/dist/src/tseng.h U xsrc/external/mit/xf86-video-tseng/dist/src/Makefile.in U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_mode.c U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_accel.h U xsrc/external/mit/xf86-video-tseng/dist/man/Makefile.am U xsrc/external/mit/xf86-video-tseng/dist/man/tseng.man U xsrc/external/mit/xf86-video-tseng/dist/man/Makefile.in No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src
Module Name:xsrc
Committed By: mrg
Date: Sat Jul 17 06:34:14 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src: legacy_crtc.c
radeon_cursor.c radeon_dri.c radeon_driver.c radeon_exa_funcs.c
Log Message:
merge xf86-video-ati 6.13.1
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c:1.3 xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c:1.4
--- xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c:1.3 Sun May 23 06:10:16 2010
+++ xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c Sat Jul 17 06:34:13 2010
@@ -1185,10 +1185,12 @@
/* Define PLL registers for requested video mode */
static void
-RADEONInitPLLRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save,
+RADEONInitPLLRegisters(xf86CrtcPtr crtc, RADEONSavePtr save,
RADEONPLLPtr pll, DisplayModePtr mode,
int flags)
{
+RADEONCrtcPrivatePtr radeon_crtc = crtc-driver_private;
+ScrnInfoPtr pScrn = crtc-scrn;
RADEONInfoPtr info = RADEONPTR(pScrn);
uint32_t feedback_div = 0;
uint32_t frac_fb_div = 0;
@@ -1224,7 +1226,13 @@
return;
}
-RADEONComputePLL(pScrn, pll, mode-Clock, freq, feedback_div, frac_fb_div, reference_div, post_divider, flags);
+if (xf86ReturnOptValBool(info-Options, OPTION_NEW_PLL, FALSE))
+ radeon_crtc-pll_algo = RADEON_PLL_NEW;
+else
+ radeon_crtc-pll_algo = RADEON_PLL_OLD;
+
+RADEONComputePLL(crtc, pll, mode-Clock, freq,
+ feedback_div, frac_fb_div, reference_div, post_divider, flags);
for (post_div = post_divs[0]; post_div-divider; ++post_div) {
if (post_div-divider == post_divider)
@@ -1268,10 +1276,12 @@
/* Define PLL2 registers for requested video mode */
static void
-RADEONInitPLL2Registers(ScrnInfoPtr pScrn, RADEONSavePtr save,
+RADEONInitPLL2Registers(xf86CrtcPtr crtc, RADEONSavePtr save,
RADEONPLLPtr pll, DisplayModePtr mode,
int flags)
{
+RADEONCrtcPrivatePtr radeon_crtc = crtc-driver_private;
+ScrnInfoPtr pScrn = crtc-scrn;
RADEONInfoPtr info = RADEONPTR(pScrn);
uint32_t feedback_div = 0;
uint32_t frac_fb_div = 0;
@@ -1305,7 +1315,13 @@
return;
}
-RADEONComputePLL(pScrn, pll, mode-Clock, freq, feedback_div, frac_fb_div, reference_div, post_divider, flags);
+if (xf86ReturnOptValBool(info-Options, OPTION_NEW_PLL, FALSE))
+ radeon_crtc-pll_algo = RADEON_PLL_NEW;
+else
+ radeon_crtc-pll_algo = RADEON_PLL_OLD;
+
+RADEONComputePLL(crtc, pll, mode-Clock, freq,
+ feedback_div, frac_fb_div, reference_div, post_divider, flags);
for (post_div = post_divs[0]; post_div-divider; ++post_div) {
if (post_div-divider == post_divider)
@@ -1797,7 +1813,7 @@
dot_clock = adjusted_mode-Clock / 1000.0;
if (dot_clock) {
ErrorF(init pll1\n);
- RADEONInitPLLRegisters(pScrn, info-ModeReg, info-pll, adjusted_mode, pll_flags);
+ RADEONInitPLLRegisters(crtc, info-ModeReg, info-pll, adjusted_mode, pll_flags);
} else {
info-ModeReg-ppll_ref_div = info-SavedReg-ppll_ref_div;
info-ModeReg-ppll_div_3 = info-SavedReg-ppll_div_3;
@@ -1811,7 +1827,7 @@
dot_clock = adjusted_mode-Clock / 1000.0;
if (dot_clock) {
ErrorF(init pll2\n);
- RADEONInitPLL2Registers(pScrn, info-ModeReg, info-pll, adjusted_mode, pll_flags);
+ RADEONInitPLL2Registers(crtc, info-ModeReg, info-pll, adjusted_mode, pll_flags);
}
break;
}
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c:1.3 xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c:1.4
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c:1.3 Sun May 23 06:10:16 2010
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c Sat Jul 17 06:34:13 2010
@@ -343,7 +343,7 @@
ScrnInfoPtr pScrn = crtc-scrn;
RADEONCrtcPrivatePtr radeon_crtc = crtc-driver_private;
RADEONInfoPtr info = RADEONPTR(pScrn);
-uint32_t *pixels = (uint32_t *)(pointer)(info-FB + radeon_crtc-cursor_offset);
+uint32_t *pixels = (uint32_t *)(pointer)(info-FB + pScrn-fbOffset + radeon_crtc-cursor_offset);
intpixel, i;
CURSOR_SWAPPING_DECL_MMIO
@@ -386,7 +386,7 @@
RADEONCrtcPrivatePtr radeon_crtc = crtc-driver_private;
RADEONInfoPtr info = RADEONPTR(pScrn);
CURSOR_SWAPPING_DECL_MMIO
-
CVS commit: xsrc/external/mit/xf86-video-neomagic/dist/src
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 06:34:36 UTC 2010 Removed Files: xsrc/external/mit/xf86-video-neomagic/dist/src: neo_bank.c Log Message: merge xf86-video-neomagic 1.2.5 To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/xf86-video-neomagic/dist/src/neo_bank.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-sis/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 06:35:13 UTC 2010 Removed Files: xsrc/external/mit/xf86-video-sis/dist: README.sgml Log Message: merge xf86-video-sis 0.10.3 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-sis/dist/README.sgml Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-ati/include
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 06:38:45 UTC 2010 Modified Files: xsrc/external/mit/xf86-video-ati/include: config.h Log Message: update for xf86-video-ati 6.13.1 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-ati/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-ati/include/config.h diff -u xsrc/external/mit/xf86-video-ati/include/config.h:1.5 xsrc/external/mit/xf86-video-ati/include/config.h:1.6 --- xsrc/external/mit/xf86-video-ati/include/config.h:1.5 Sun May 23 06:12:33 2010 +++ xsrc/external/mit/xf86-video-ati/include/config.h Sat Jul 17 06:38:45 2010 @@ -21,6 +21,9 @@ /* Define to 1 if you have the inttypes.h header file. */ #define HAVE_INTTYPES_H 1 +/* libudev support */ +#undef HAVE_LIBUDEV + /* Define to 1 if you have the memory.h header file. */ #define HAVE_MEMORY_H 1 @@ -74,13 +77,13 @@ #define PACKAGE_NAME xf86-video-ati /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-video-ati 6.13.0 +#define PACKAGE_STRING xf86-video-ati 6.13.1 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-video-ati /* Define to the version of this package. */ -#define PACKAGE_VERSION 6.13.0 +#define PACKAGE_VERSION 6.13.1 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 6 @@ -89,7 +92,7 @@ #define PACKAGE_VERSION_MINOR 13 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 0 +#define PACKAGE_VERSION_PATCHLEVEL 1 /* Enable DRI2 code */ /* #undef RADEON_DRI2 */ @@ -107,7 +110,7 @@ #define USE_XAA 1 /* Version number of package */ -#define VERSION 6.13.0 +#define VERSION 6.13.1 /* Enable DRI driver support */ #define XF86DRI 1
CVS commit: xsrc/external/mit/xf86-video-tseng/include
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 06:40:20 UTC 2010 Modified Files: xsrc/external/mit/xf86-video-tseng/include: config.h Log Message: update this for xf86-video-tsent 1.2.4 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-tseng/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-tseng/include/config.h diff -u xsrc/external/mit/xf86-video-tseng/include/config.h:1.4 xsrc/external/mit/xf86-video-tseng/include/config.h:1.5 --- xsrc/external/mit/xf86-video-tseng/include/config.h:1.4 Sun Jan 10 09:59:37 2010 +++ xsrc/external/mit/xf86-video-tseng/include/config.h Sat Jul 17 06:40:20 2010 @@ -39,6 +39,10 @@ /* Have 4bpp support */ /* #undef HAVE_XF4BPP */ +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #define PACKAGE xf86-video-tseng @@ -49,13 +53,13 @@ #define PACKAGE_NAME xf86-video-tseng /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-video-tseng 1.2.3 +#define PACKAGE_STRING xf86-video-tseng 1.2.4 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-video-tseng /* Define to the version of this package. */ -#define PACKAGE_VERSION 1.2.3 +#define PACKAGE_VERSION 1.2.4 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 @@ -64,10 +68,10 @@ #define PACKAGE_VERSION_MINOR 2 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 3 +#define PACKAGE_VERSION_PATCHLEVEL 4 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 1.2.3 +#define VERSION 1.2.4
CVS commit: xsrc/external/mit/xf86-video-sis/include
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 06:41:22 UTC 2010 Modified Files: xsrc/external/mit/xf86-video-sis/include: config.h Log Message: update for xf86-video-sis 0.10.3 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-sis/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-sis/include/config.h diff -u xsrc/external/mit/xf86-video-sis/include/config.h:1.4 xsrc/external/mit/xf86-video-sis/include/config.h:1.5 --- xsrc/external/mit/xf86-video-sis/include/config.h:1.4 Sun Jan 10 09:59:27 2010 +++ xsrc/external/mit/xf86-video-sis/include/config.h Sat Jul 17 06:41:22 2010 @@ -36,6 +36,10 @@ /* xextproto 7.1 available */ /* #undef HAVE_XEXTPROTO_71 */ +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #define PACKAGE xf86-video-sis @@ -46,13 +50,13 @@ #define PACKAGE_NAME xf86-video-sis /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-video-sis 0.10.2 +#define PACKAGE_STRING xf86-video-sis 0.10.3 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-video-sis /* Define to the version of this package. */ -#define PACKAGE_VERSION 0.10.2 +#define PACKAGE_VERSION 0.10.3 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 0 @@ -61,13 +65,13 @@ #define PACKAGE_VERSION_MINOR 10 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 2 +#define PACKAGE_VERSION_PATCHLEVEL 3 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 0.10.2 +#define VERSION 0.10.3 /* Enable DRI driver support */ #define XF86DRI 1
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-neomagic
Module Name:src Committed By: mrg Date: Sat Jul 17 06:55:39 UTC 2010 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-neomagic: Makefile Log Message: remove now-gone neo_bank.c To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile:1.4 --- src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile:1.3 Sat May 22 07:18:37 2010 +++ src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile Sat Jul 17 06:55:39 2010 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2010/05/22 07:18:37 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2010/07/17 06:55:39 mrg Exp $ DRIVER= xf86-video-neomagic DRIVER_NAME= neomagic_drv -SRCS= neo_2070.c neo_2090.c neo_2097.c neo_2200.c neo_bank.c +SRCS= neo_2070.c neo_2090.c neo_2097.c neo_2200.c SRCS+= neo_cursor.c neo_dga.c neo_driver.c neo_i2c.c SRCS+= neo_shadow.c neo_video.c MAN= neomagic.4
CVS commit: xsrc/external/mit/xf86-video-ati/include
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 07:03:56 UTC 2010 Modified Files: xsrc/external/mit/xf86-video-ati/include: config.h Log Message: fix the previous; it wasn't the right one. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-ati/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-ati/include/config.h diff -u xsrc/external/mit/xf86-video-ati/include/config.h:1.6 xsrc/external/mit/xf86-video-ati/include/config.h:1.7 --- xsrc/external/mit/xf86-video-ati/include/config.h:1.6 Sat Jul 17 06:38:45 2010 +++ xsrc/external/mit/xf86-video-ati/include/config.h Sat Jul 17 07:03:56 2010 @@ -22,7 +22,7 @@ #define HAVE_INTTYPES_H 1 /* libudev support */ -#undef HAVE_LIBUDEV +/* #undef HAVE_LIBUDEV */ /* Define to 1 if you have the memory.h header file. */ #define HAVE_MEMORY_H 1 @@ -95,7 +95,7 @@ #define PACKAGE_VERSION_PATCHLEVEL 1 /* Enable DRI2 code */ -/* #undef RADEON_DRI2 */ +#define RADEON_DRI2 1 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -119,7 +119,7 @@ #define XF86DRI_DEVEL 1 /* DRM kernel modesetting */ -/* #undef XF86DRM_MODE */ +#define XF86DRM_MODE 1 /* X server has built-in mode code */ #define XMODES 1
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 07:07:00 UTC 2010 Modified Files: xsrc/external/mit/xf86-video-sis/include: config.h xsrc/external/mit/xf86-video-tseng/include: config.h Log Message: regenerate these with the right thing. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-sis/include/config.h cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-tseng/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-sis/include/config.h diff -u xsrc/external/mit/xf86-video-sis/include/config.h:1.5 xsrc/external/mit/xf86-video-sis/include/config.h:1.6 --- xsrc/external/mit/xf86-video-sis/include/config.h:1.5 Sat Jul 17 06:41:22 2010 +++ xsrc/external/mit/xf86-video-sis/include/config.h Sat Jul 17 07:07:00 2010 @@ -34,11 +34,11 @@ #define HAVE_UNISTD_H 1 /* xextproto 7.1 available */ -/* #undef HAVE_XEXTPROTO_71 */ +#define HAVE_XEXTPROTO_71 1 /* Define to the sub-directory in which libtool stores uninstalled libraries. */ -#undef LT_OBJDIR +#define LT_OBJDIR .libs/ /* Name of package */ #define PACKAGE xf86-video-sis Index: xsrc/external/mit/xf86-video-tseng/include/config.h diff -u xsrc/external/mit/xf86-video-tseng/include/config.h:1.5 xsrc/external/mit/xf86-video-tseng/include/config.h:1.6 --- xsrc/external/mit/xf86-video-tseng/include/config.h:1.5 Sat Jul 17 06:40:20 2010 +++ xsrc/external/mit/xf86-video-tseng/include/config.h Sat Jul 17 07:07:00 2010 @@ -41,7 +41,7 @@ /* Define to the sub-directory in which libtool stores uninstalled libraries. */ -#undef LT_OBJDIR +#define LT_OBJDIR .libs/ /* Name of package */ #define PACKAGE xf86-video-tseng
CVS commit: xsrc/external/mit/xf86-video-ati
Module Name:xsrc
Committed By: mrg
Date: Sat Jul 17 07:55:35 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src: r6xx_accel.c
xsrc/external/mit/xf86-video-ati/include: config.h
Log Message:
(a) - don't enable KMS support
(b) - fix compile error when XF86_DRMMODE is not set
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-ati/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c:1.1.1.4 xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c:1.1.1.4 Sat Jul 17 06:31:47 2010
+++ xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c Sat Jul 17 07:55:34 2010
@@ -1262,10 +1262,10 @@
void r600_vb_no_space(ScrnInfoPtr pScrn, int vert_size)
{
-#ifdef XF86DRM_MODE
RADEONInfoPtr info = RADEONPTR(pScrn);
struct radeon_accel_state *accel_state = info-accel_state;
+#ifdef XF86DRM_MODE
if (info-cs) {
if (accel_state-vb_bo) {
if (accel_state-vb_start_op != accel_state-vb_offset) {
Index: xsrc/external/mit/xf86-video-ati/include/config.h
diff -u xsrc/external/mit/xf86-video-ati/include/config.h:1.7 xsrc/external/mit/xf86-video-ati/include/config.h:1.8
--- xsrc/external/mit/xf86-video-ati/include/config.h:1.7 Sat Jul 17 07:03:56 2010
+++ xsrc/external/mit/xf86-video-ati/include/config.h Sat Jul 17 07:55:34 2010
@@ -119,7 +119,7 @@
#define XF86DRI_DEVEL 1
/* DRM kernel modesetting */
-#define XF86DRM_MODE 1
+/* #define XF86DRM_MODE 1 */
/* X server has built-in mode code */
#define XMODES 1
CVS commit: xsrc/external/mit/libXrender/include
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 07:57:33 UTC 2010 Modified Files: xsrc/external/mit/libXrender/include: config.h Log Message: this never got bumped properly for libXrender 0.9.6; do so now. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXrender/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXrender/include/config.h diff -u xsrc/external/mit/libXrender/include/config.h:1.2 xsrc/external/mit/libXrender/include/config.h:1.3 --- xsrc/external/mit/libXrender/include/config.h:1.2 Sun Nov 8 10:56:49 2009 +++ xsrc/external/mit/libXrender/include/config.h Sat Jul 17 07:57:33 2010 @@ -41,13 +41,13 @@ #define PACKAGE_NAME libXrender /* Define to the full name and version of this package. */ -#define PACKAGE_STRING libXrender 0.9.5 +#define PACKAGE_STRING libXrender 0.9.6 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME libXrender /* Define to the version of this package. */ -#define PACKAGE_VERSION 0.9.5 +#define PACKAGE_VERSION 0.9.6 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 0 @@ -56,10 +56,10 @@ #define PACKAGE_VERSION_MINOR 9 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 5 +#define PACKAGE_VERSION_PATCHLEVEL 6 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 0.9.5 +#define VERSION 0.9.6
CVS commit: src/usr.bin/progress
Module Name:src
Committed By: tron
Date: Sat Jul 17 10:51:04 UTC 2010
Modified Files:
src/usr.bin/progress: progress.c
Log Message:
Fix argument handling of the -b option on 64bit platforms. Using
-b 1024k would previously fail with this error message:
progress: buffer size 1048576 is greater than -1.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/progress/progress.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/progress/progress.c
diff -u src/usr.bin/progress/progress.c:1.17 src/usr.bin/progress/progress.c:1.18
--- src/usr.bin/progress/progress.c:1.17 Mon May 26 04:53:11 2008
+++ src/usr.bin/progress/progress.c Sat Jul 17 10:51:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: progress.c,v 1.17 2008/05/26 04:53:11 dholland Exp $ */
+/* $NetBSD: progress.c,v 1.18 2010/07/17 10:51:03 tron Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: progress.c,v 1.17 2008/05/26 04:53:11 dholland Exp $);
+__RCSID($NetBSD: progress.c,v 1.18 2010/07/17 10:51:03 tron Exp $);
#endif/* not lint */
#include sys/types.h
@@ -112,7 +112,7 @@
switch (ch) {
case 'b':
buffersize = (size_t) strsuftoll(buffer size, optarg,
- 0, SIZE_T_MAX);
+ 0, SSIZE_MAX);
break;
case 'e':
eflag++;
CVS commit: src/sys/arch/sandpoint/stand/netboot
Module Name:src
Committed By: phx
Date: Sat Jul 17 14:15:34 UTC 2010
Modified Files:
src/sys/arch/sandpoint/stand/netboot: pciide.c
Log Message:
Code to set PCI cfg xfer mode registers of 0680A IDE, to make sure the
chip is in PIO mode.
Patch submitted by Toru Nishimura.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sandpoint/stand/netboot/pciide.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/stand/netboot/pciide.c
diff -u src/sys/arch/sandpoint/stand/netboot/pciide.c:1.8 src/sys/arch/sandpoint/stand/netboot/pciide.c:1.9
--- src/sys/arch/sandpoint/stand/netboot/pciide.c:1.8 Sat Jun 26 21:45:49 2010
+++ src/sys/arch/sandpoint/stand/netboot/pciide.c Sat Jul 17 14:15:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide.c,v 1.8 2010/06/26 21:45:49 phx Exp $ */
+/* $NetBSD: pciide.c,v 1.9 2010/07/17 14:15:34 phx Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -41,7 +41,8 @@
int (*chipfix)(struct dkdev_ata *);
int (*presense)(struct dkdev_ata *, int);
};
-static struct myops cmdideops = { NULL, NULL };
+static int cmdidefix(struct dkdev_ata *);
+static struct myops cmdideops = { cmdidefix, NULL };
static struct myops *myops = cmdideops;
int pciide_match(unsigned, void *);
@@ -76,9 +77,6 @@
l-iobuf = allocaligned(512, 16);
l-tag = tag;
- if (myops-chipfix)
- (*myops-chipfix)(l);
-
val = pcicfgread(tag, PCI_CLASS_REG);
native = val 03;
if (native) {
@@ -119,5 +117,27 @@
if (l-presense[n])
printf(channel %d present\n, n);
}
+
+ /* make sure to have PIO0 */
+ if (myops-chipfix)
+ (*myops-chipfix)(l);
+
return l;
}
+
+static int
+cmdidefix(struct dkdev_ata *l)
+{
+ int v;
+
+ v = pcicfgread(l-tag, 0x80);
+ pcicfgwrite(l-tag, 0x80, (v ~0xff) | 0x01);
+ v = pcicfgread(l-tag, 0x84);
+ pcicfgwrite(l-tag, 0x84, (v ~0xff) | 0x01);
+ v = pcicfgread(l-tag, 0xa4);
+ pcicfgwrite(l-tag, 0xa4, (v ~0x) | 0x328a);
+ v = pcicfgread(l-tag, 0xb4);
+ pcicfgwrite(l-tag, 0xb4, (v ~0x) | 0x328a);
+
+ return 1;
+}
CVS commit: src/sys/arch/hpcarm/include
Module Name:src Committed By: tsutsui Date: Sat Jul 17 15:13:18 UTC 2010 Modified Files: src/sys/arch/hpcarm/include: disklabel.h types.h Log Message: Bump MAXPARTITIONS from 8 to 16 using __HAVE_OLD_DISKLABEL compat method as i386 and hpcmips. PR port-hpcarm/18256 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hpcarm/include/disklabel.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hpcarm/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcarm/include/disklabel.h diff -u src/sys/arch/hpcarm/include/disklabel.h:1.7 src/sys/arch/hpcarm/include/disklabel.h:1.8 --- src/sys/arch/hpcarm/include/disklabel.h:1.7 Mon Nov 23 13:40:09 2009 +++ src/sys/arch/hpcarm/include/disklabel.h Sat Jul 17 15:13:18 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.h,v 1.7 2009/11/23 13:40:09 pooka Exp $ */ +/* $NetBSD: disklabel.h,v 1.8 2010/07/17 15:13:18 tsutsui Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -33,10 +33,24 @@ #ifndef _MACHINE_DISKLABEL_H_ #define _MACHINE_DISKLABEL_H_ -#define LABELSECTOR 1 /* sector containing label */ -#define LABELOFFSET 0 /* offset of label in sector */ -#define MAXPARTITIONS 8 /* number of partitions */ -#define RAW_PART 3 /* raw partition: XX?d (XXX) */ +#define LABELSECTOR 1 /* sector containing label */ +#define LABELOFFSET 0 /* offset of label in sector */ +#define MAXPARTITIONS 16 /* number of partitions */ +#define OLDMAXPARTITIONS 8 /* number of partitions before 1.6 */ +#define RAW_PART 3 /* raw partition: XX?d (XXX) */ + +/* + * We use the highest bit of the minor number for the partition number. + * This maintains backward compatibility with device nodes created before + * MAXPARTITIONS was increased. + */ +#define __HPCARM_MAXDISKS ((1 20) / MAXPARTITIONS) +#define DISKUNIT(dev) ((minor(dev) / OLDMAXPARTITIONS) % __HPCARM_MAXDISKS) +#define DISKPART(dev) ((minor(dev) % OLDMAXPARTITIONS) + \ +((minor(dev) / (__HPCARM_MAXDISKS * OLDMAXPARTITIONS)) * OLDMAXPARTITIONS)) +#define DISKMINOR(unit, part) \ +(((unit) * OLDMAXPARTITIONS) + ((part) % OLDMAXPARTITIONS) + \ + ((part) / OLDMAXPARTITIONS) * (__HPCARM_MAXDISKS * OLDMAXPARTITIONS)) /* Pull in MBR partition definitions. */ #if HAVE_NBTOOL_CONFIG_H Index: src/sys/arch/hpcarm/include/types.h diff -u src/sys/arch/hpcarm/include/types.h:1.13 src/sys/arch/hpcarm/include/types.h:1.14 --- src/sys/arch/hpcarm/include/types.h:1.13 Sun Jan 20 18:09:06 2008 +++ src/sys/arch/hpcarm/include/types.h Sat Jul 17 15:13:18 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.13 2008/01/20 18:09:06 joerg Exp $ */ +/* $NetBSD: types.h,v 1.14 2010/07/17 15:13:18 tsutsui Exp $ */ #ifndef _HPCARM_TYPES_H_ #define _HPCARM_TYPES_H_ @@ -6,6 +6,7 @@ #include arm/arm32/types.h #define __HAVE_DEVICE_REGISTER +#define __HAVE_OLD_DISKLABEL #define __GENERIC_SOFT_INTERRUPTS_ALL_LEVELS #endif
CVS commit: src/sys/arch
Module Name:src Committed By: tsutsui Date: Sat Jul 17 15:25:57 UTC 2010 Modified Files: src/sys/arch/bebox/include: types.h src/sys/arch/mvmeppc/include: types.h src/sys/arch/rs6000/include: types.h src/sys/arch/sandpoint/include: types.h Log Message: Remove obsolete __HAVE_GENERIC_SOFT_INTERRUPTS, which is mandatory since 2007/07: http://mail-index.NetBSD.org/source-changes/2007/07/14/0039.html To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/bebox/include/types.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mvmeppc/include/types.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/rs6000/include/types.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sandpoint/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/bebox/include/types.h diff -u src/sys/arch/bebox/include/types.h:1.10 src/sys/arch/bebox/include/types.h:1.11 --- src/sys/arch/bebox/include/types.h:1.10 Sun Jan 20 18:09:05 2008 +++ src/sys/arch/bebox/include/types.h Sat Jul 17 15:25:57 2010 @@ -1,6 +1,5 @@ -/* $NetBSD: types.h,v 1.10 2008/01/20 18:09:05 joerg Exp $ */ +/* $NetBSD: types.h,v 1.11 2010/07/17 15:25:57 tsutsui Exp $ */ #define __HAVE_DEVICE_REGISTER -#define __HAVE_GENERIC_SOFT_INTERRUPTS #include powerpc/types.h Index: src/sys/arch/mvmeppc/include/types.h diff -u src/sys/arch/mvmeppc/include/types.h:1.6 src/sys/arch/mvmeppc/include/types.h:1.7 --- src/sys/arch/mvmeppc/include/types.h:1.6 Sun Jan 20 18:09:07 2008 +++ src/sys/arch/mvmeppc/include/types.h Sat Jul 17 15:25:57 2010 @@ -1,6 +1,5 @@ -/* $NetBSD: types.h,v 1.6 2008/01/20 18:09:07 joerg Exp $ */ +/* $NetBSD: types.h,v 1.7 2010/07/17 15:25:57 tsutsui Exp $ */ #include powerpc/types.h #define __HAVE_DEVICE_REGISTER -#define __HAVE_GENERIC_SOFT_INTERRUPTS Index: src/sys/arch/rs6000/include/types.h diff -u src/sys/arch/rs6000/include/types.h:1.2 src/sys/arch/rs6000/include/types.h:1.3 --- src/sys/arch/rs6000/include/types.h:1.2 Sun Jan 20 18:09:09 2008 +++ src/sys/arch/rs6000/include/types.h Sat Jul 17 15:25:57 2010 @@ -1,8 +1,7 @@ -/* $NetBSD: types.h,v 1.2 2008/01/20 18:09:09 joerg Exp $ */ +/* $NetBSD: types.h,v 1.3 2010/07/17 15:25:57 tsutsui Exp $ */ #define __HAVE_NWSCONS #define __HAVE_DEVICE_REGISTER -#define __HAVE_GENERIC_SOFT_INTERRUPTS /*#define PMAP_NEED_MAPKERNEL*/ #include powerpc/types.h Index: src/sys/arch/sandpoint/include/types.h diff -u src/sys/arch/sandpoint/include/types.h:1.6 src/sys/arch/sandpoint/include/types.h:1.7 --- src/sys/arch/sandpoint/include/types.h:1.6 Sun Jan 20 18:09:09 2008 +++ src/sys/arch/sandpoint/include/types.h Sat Jul 17 15:25:57 2010 @@ -1,7 +1,6 @@ -/* $NetBSD: types.h,v 1.6 2008/01/20 18:09:09 joerg Exp $ */ +/* $NetBSD: types.h,v 1.7 2010/07/17 15:25:57 tsutsui Exp $ */ #define __HAVE_DEVICE_REGISTER -#define __HAVE_GENERIC_SOFT_INTERRUPTS #include powerpc/types.h
CVS commit: src/tests/lib
Module Name:src
Committed By: jmmv
Date: Sat Jul 17 19:25:29 UTC 2010
Modified Files:
src/tests/lib: Makefile
Added Files:
src/tests/lib/csu: Makefile h_initfini.c t_crt0.sh
src/tests/lib/csu/arch/alpha: initfini_asm.S
src/tests/lib/csu/arch/arm: initfini_asm.S
src/tests/lib/csu/arch/hppa: initfini_asm.S
src/tests/lib/csu/arch/i386: initfini_asm.S
src/tests/lib/csu/arch/m68k: initfini_asm.S
src/tests/lib/csu/arch/mips: initfini_asm.S
src/tests/lib/csu/arch/powerpc: initfini_asm.S
src/tests/lib/csu/arch/sh3: initfini_asm.S
src/tests/lib/csu/arch/sparc: initfini_asm.S
src/tests/lib/csu/arch/sparc64: initfini_asm.S
src/tests/lib/csu/arch/vax: initfini_asm.S
src/tests/lib/csu/arch/x86_64: initfini_asm.S
Log Message:
Convert the csu tests to atf.
Initial work from the GSoC 2008 project by Lukasz Strzygowski.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/Makefile \
src/tests/lib/csu/h_initfini.c src/tests/lib/csu/t_crt0.sh
cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/alpha/initfini_asm.S
cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/arm/initfini_asm.S
cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/hppa/initfini_asm.S
cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/i386/initfini_asm.S
cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/m68k/initfini_asm.S
cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/mips/initfini_asm.S
cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/powerpc/initfini_asm.S
cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/sh3/initfini_asm.S
cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/sparc/initfini_asm.S
cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/sparc64/initfini_asm.S
cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/vax/initfini_asm.S
cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/x86_64/initfini_asm.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/Makefile
diff -u src/tests/lib/Makefile:1.6 src/tests/lib/Makefile:1.7
--- src/tests/lib/Makefile:1.6 Fri Jul 16 15:42:53 2010
+++ src/tests/lib/Makefile Sat Jul 17 19:25:26 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/07/16 15:42:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2010/07/17 19:25:26 jmmv Exp $
.include bsd.own.mk
-TESTS_SUBDIRS= libc libevent libposix libprop librt libpthread libutil \
+TESTS_SUBDIRS= csu libc libevent libposix libprop librt libpthread libutil \
semaphore
.if (${MKSKEY} != no)
Added files:
Index: src/tests/lib/csu/Makefile
diff -u /dev/null src/tests/lib/csu/Makefile:1.1
--- /dev/null Sat Jul 17 19:25:29 2010
+++ src/tests/lib/csu/Makefile Sat Jul 17 19:25:27 2010
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2010/07/17 19:25:27 jmmv Exp $
+
+NOMAN= # defined
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/lib/csu
+
+.if exists(arch/${MACHINE_CPU}/initfini_asm.S)
+TESTS_SH= t_crt0
+
+BINDIR= ${TESTSDIR}
+PROG= h_initfini
+SRCS= h_initfini.c initfini_asm.S
+WARNS?= 1
+.PATH: ${.CURDIR}/arch/${MACHINE_CPU}
+.endif
+
+.include bsd.test.mk
Index: src/tests/lib/csu/h_initfini.c
diff -u /dev/null src/tests/lib/csu/h_initfini.c:1.1
--- /dev/null Sat Jul 17 19:25:29 2010
+++ src/tests/lib/csu/h_initfini.c Sat Jul 17 19:25:27 2010
@@ -0,0 +1,69 @@
+/* $NetBSD: h_initfini.c,v 1.1 2010/07/17 19:25:27 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * This file placed in the public domain.
+ * Jason R. Thorpe, July 16, 2001.
+ */
+
+#include
CVS commit: src/etc/mtree
Module Name:src Committed By: jmmv Date: Sat Jul 17 19:26:51 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Add directories for the lib/csu/ and include/ tests. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.37 src/etc/mtree/NetBSD.dist.base:1.38 --- src/etc/mtree/NetBSD.dist.base:1.37 Fri Jul 16 15:43:23 2010 +++ src/etc/mtree/NetBSD.dist.base Sat Jul 17 19:26:50 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.37 2010/07/16 15:43:23 jmmv Exp $ +# $NetBSD: NetBSD.dist.base,v 1.38 2010/07/17 19:26:50 jmmv Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -214,6 +214,8 @@ ./usr/libdata/debug/usr/tests/fs/umapfs ./usr/libdata/debug/usr/tests/fs/union ./usr/libdata/debug/usr/tests/fs/vfs +./usr/libdata/debug/usr/tests/include +./usr/libdata/debug/usr/tests/include/sys ./usr/libdata/debug/usr/tests/ipf ./usr/libdata/debug/usr/tests/kernel ./usr/libdata/debug/usr/tests/kernel/kqueue @@ -221,6 +223,7 @@ ./usr/libdata/debug/usr/tests/kernel/kqueue/write ./usr/libdata/debug/usr/tests/kernel/tty ./usr/libdata/debug/usr/tests/lib +./usr/libdata/debug/usr/tests/lib/csu ./usr/libdata/debug/usr/tests/lib/libc ./usr/libdata/debug/usr/tests/lib/libc/hash ./usr/libdata/debug/usr/tests/lib/libc/stdlib @@ -1131,6 +1134,8 @@ ./usr/tests/fs/union ./usr/tests/fs/vfs ./usr/tests/games +./usr/tests/include +./usr/tests/include/sys ./usr/tests/ipf ./usr/tests/ipf/expected ./usr/tests/ipf/input @@ -1141,6 +1146,7 @@ ./usr/tests/kernel/kqueue/write ./usr/tests/kernel/tty ./usr/tests/lib +./usr/tests/lib/csu ./usr/tests/lib/libc ./usr/tests/lib/libc/hash ./usr/tests/lib/libc/stdlib
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: jmmv Date: Sat Jul 17 19:27:39 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add tests for lib/csu/ and include/. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.111 src/distrib/sets/lists/tests/mi:1.112 --- src/distrib/sets/lists/tests/mi:1.111 Fri Jul 16 15:45:05 2010 +++ src/distrib/sets/lists/tests/mi Sat Jul 17 19:27:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.111 2010/07/16 15:45:05 jmmv Exp $ +# $NetBSD: mi,v 1.112 2010/07/17 19:27:39 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -221,6 +221,13 @@ ./usr/libdata/debug/usr/tests/fs/vfs/t_rmdirrace.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/vfs/t_vfsops.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/vfs/t_vnops.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/include tests-ipf-tests +./usr/libdata/debug/usr/tests/include/systests-ipf-tests +./usr/libdata/debug/usr/tests/include/sys/t_bootblock.debug tests-ipf-tests debug,atf +./usr/libdata/debug/usr/tests/include/t_bitstring.debug tests-ipf-tests debug,atf +./usr/libdata/debug/usr/tests/include/t_inttypes.debug tests-ipf-tests debug,atf +./usr/libdata/debug/usr/tests/include/t_limits.debug tests-ipf-tests debug,atf +./usr/libdata/debug/usr/tests/include/t_stdint.debug tests-ipf-tests debug,atf ./usr/libdata/debug/usr/tests/ipf tests-ipf-tests ./usr/libdata/debug/usr/tests/kernel tests-kernel-tests ./usr/libdata/debug/usr/tests/kernel/kqueuetests-kernel-tests @@ -254,6 +261,8 @@ ./usr/libdata/debug/usr/tests/kernel/ttytests-kernel-tests ./usr/libdata/debug/usr/tests/kernel/tty/t_pr.debug tests-kernel-tests debug,atf ./usr/libdata/debug/usr/tests/lib tests-lib-debug +./usr/libdata/debug/usr/tests/lib/csu tests-lib-debug +./usr/libdata/debug/usr/tests/lib/csu/h_initfini tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc tests-lib-debug ./usr/libdata/debug/usr/tests/lib/libc/hashtests-lib-debug ./usr/libdata/debug/usr/tests/lib/libc/hash/t_sha2.debug tests-lib-debug debug,atf @@ -991,6 +1000,21 @@ ./usr/tests/gamestests-games-tests ./usr/tests/games/Atffile tests-games-tests ./usr/tests/games/t_factor tests-games-tests +./usr/tests/includetests-include-tests +./usr/tests/include/Atffile tests-include-tests atf +./usr/tests/include/d_bitstring_27.out tests-include-tests atf +./usr/tests/include/d_bitstring_32.out tests-include-tests atf +./usr/tests/include/d_bitstring_49.out tests-include-tests atf +./usr/tests/include/d_bitstring_64.out tests-include-tests atf +./usr/tests/include/d_bitstring_67.out tests-include-tests atf +./usr/tests/include/d_bitstring_8.out tests-include-tests atf +./usr/tests/include/systests-include-tests +./usr/tests/include/sys/Atffile tests-include-tests atf +./usr/tests/include/sys/t_bootblock tests-include-tests atf +./usr/tests/include/t_bitstring tests-include-tests atf +./usr/tests/include/t_inttypes tests-include-tests atf +./usr/tests/include/t_limits tests-include-tests atf +./usr/tests/include/t_stdint tests-include-tests atf ./usr/tests/ipf tests-ipf-tests ./usr/tests/ipf/Atffiletests-ipf-tests ./usr/tests/ipf/expected tests-ipf-tests @@ -1334,6 +1358,10 @@ ./usr/tests/kernel/tty/t_pr tests-kernel-tests atf ./usr/tests/lib tests-lib-tests ./usr/tests/lib/Atffiletests-lib-tests atf +./usr/tests/lib/csutests-lib-tests +./usr/tests/lib/csu/Atffile tests-lib-tests atf +./usr/tests/lib/csu/h_initfini tests-lib-tests atf +./usr/tests/lib/csu/t_crt0 tests-lib-tests atf ./usr/tests/lib/libctests-lib-tests ./usr/tests/lib/libc/Atffile tests-lib-tests atf ./usr/tests/lib/libc/hash tests-lib-tests
CVS commit: src/regress
Module Name:src Committed By: jmmv Date: Sat Jul 17 19:29:38 UTC 2010 Modified Files: src/regress: Makefile src/regress/lib: Makefile Removed Files: src/regress/include: Makefile Makefile.inc src/regress/include/bitstring: Makefile bitstring_test.c src/regress/include/bitstring/good: 27 32 49 64 67 8 src/regress/include/bootblock: Makefile bootblock_test.c src/regress/include/okheaders: Makefile symbolcheck.c src/regress/include/stdarg: Makefile src/regress/include/stdint: Makefile stdint.c src/regress/include/varargs: Makefile src/regress/lib/csu: Makefile Makefile.inc src/regress/lib/csu/initfini: Makefile expected initfini.c src/regress/lib/csu/initfini/arch/alpha: initfini_asm.S src/regress/lib/csu/initfini/arch/arm: initfini_asm.S src/regress/lib/csu/initfini/arch/hppa: initfini_asm.S src/regress/lib/csu/initfini/arch/i386: initfini_asm.S src/regress/lib/csu/initfini/arch/m68k: initfini_asm.S src/regress/lib/csu/initfini/arch/mips: initfini_asm.S src/regress/lib/csu/initfini/arch/powerpc: initfini_asm.S src/regress/lib/csu/initfini/arch/sh3: initfini_asm.S src/regress/lib/csu/initfini/arch/sparc: initfini_asm.S src/regress/lib/csu/initfini/arch/sparc64: initfini_asm.S src/regress/lib/csu/initfini/arch/vax: initfini_asm.S src/regress/lib/csu/initfini/arch/x86_64: initfini_asm.S Log Message: Remove the lib/csu/ and include/ tests; they have been converted to atf. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/regress/Makefile cvs rdiff -u -r1.10 -r0 src/regress/include/Makefile cvs rdiff -u -r1.2 -r0 src/regress/include/Makefile.inc cvs rdiff -u -r1.10 -r0 src/regress/include/bitstring/Makefile cvs rdiff -u -r1.9 -r0 src/regress/include/bitstring/bitstring_test.c cvs rdiff -u -r1.1 -r0 src/regress/include/bitstring/good/27 \ src/regress/include/bitstring/good/32 \ src/regress/include/bitstring/good/49 \ src/regress/include/bitstring/good/64 \ src/regress/include/bitstring/good/67 \ src/regress/include/bitstring/good/8 cvs rdiff -u -r1.1 -r0 src/regress/include/bootblock/Makefile cvs rdiff -u -r1.3 -r0 src/regress/include/bootblock/bootblock_test.c cvs rdiff -u -r1.4 -r0 src/regress/include/okheaders/Makefile cvs rdiff -u -r1.29 -r0 src/regress/include/okheaders/symbolcheck.c cvs rdiff -u -r1.7 -r0 src/regress/include/stdarg/Makefile cvs rdiff -u -r1.1 -r0 src/regress/include/stdint/Makefile \ src/regress/include/stdint/stdint.c cvs rdiff -u -r1.7 -r0 src/regress/include/varargs/Makefile cvs rdiff -u -r1.24 -r1.25 src/regress/lib/Makefile cvs rdiff -u -r1.1 -r0 src/regress/lib/csu/Makefile \ src/regress/lib/csu/Makefile.inc cvs rdiff -u -r1.7 -r0 src/regress/lib/csu/initfini/Makefile cvs rdiff -u -r1.1 -r0 src/regress/lib/csu/initfini/expected cvs rdiff -u -r1.2 -r0 src/regress/lib/csu/initfini/initfini.c cvs rdiff -u -r1.2 -r0 src/regress/lib/csu/initfini/arch/alpha/initfini_asm.S cvs rdiff -u -r1.2 -r0 src/regress/lib/csu/initfini/arch/arm/initfini_asm.S cvs rdiff -u -r1.2 -r0 src/regress/lib/csu/initfini/arch/hppa/initfini_asm.S cvs rdiff -u -r1.1 -r0 src/regress/lib/csu/initfini/arch/i386/initfini_asm.S cvs rdiff -u -r1.1 -r0 src/regress/lib/csu/initfini/arch/m68k/initfini_asm.S cvs rdiff -u -r1.3 -r0 src/regress/lib/csu/initfini/arch/mips/initfini_asm.S cvs rdiff -u -r1.1 -r0 \ src/regress/lib/csu/initfini/arch/powerpc/initfini_asm.S cvs rdiff -u -r1.1 -r0 src/regress/lib/csu/initfini/arch/sh3/initfini_asm.S cvs rdiff -u -r1.2 -r0 src/regress/lib/csu/initfini/arch/sparc/initfini_asm.S cvs rdiff -u -r1.2 -r0 \ src/regress/lib/csu/initfini/arch/sparc64/initfini_asm.S cvs rdiff -u -r1.1 -r0 src/regress/lib/csu/initfini/arch/vax/initfini_asm.S cvs rdiff -u -r1.1 -r0 \ src/regress/lib/csu/initfini/arch/x86_64/initfini_asm.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/regress/Makefile diff -u src/regress/Makefile:1.17 src/regress/Makefile:1.18 --- src/regress/Makefile:1.17 Tue Oct 20 21:59:55 2009 +++ src/regress/Makefile Sat Jul 17 19:29:33 2010 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2009/10/20 21:59:55 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2010/07/17 19:29:33 jmmv Exp $ # missing: libexec sbin usr.sbin share -SUBDIR+= gnu include lib libexec sys usr.bin +SUBDIR+= gnu lib libexec sys usr.bin .include bsd.subdir.mk Index: src/regress/lib/Makefile diff -u src/regress/lib/Makefile:1.24 src/regress/lib/Makefile:1.25 --- src/regress/lib/Makefile:1.24 Fri Jul 16 15:46:01 2010 +++ src/regress/lib/Makefile Sat Jul 17 19:29:35 2010 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2010/07/16 15:46:01 jmmv Exp $ +# $NetBSD: Makefile,v 1.25 2010/07/17 19:29:35 jmmv Exp $ .include bsd.own.mk -SUBDIR+= csu libc libm +SUBDIR+= libc libm .if
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Sat Jul 17 19:31:47 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Note the conversion of the include and csu tests to atf. To generate a diff of this commit: cvs rdiff -u -r1.1416 -r1.1417 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1416 src/doc/CHANGES:1.1417 --- src/doc/CHANGES:1.1416 Fri Jul 16 15:47:06 2010 +++ src/doc/CHANGES Sat Jul 17 19:31:47 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1416 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1417 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -690,3 +690,4 @@ [kiyohara 20100712] tests: Convert the libposix, libprop, libpthread, librt, libskey and libutil tests to ATF. [jmmv 20010716] + tests: Convert the include and csu tests to ATF. [jmmv 20010717]
CVS commit: xsrc/external/mit/xcb-util/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 20:28:32 UTC 2010 Update of /cvsroot/xsrc/external/mit/xcb-util/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18550 Log Message: initial import of xcb-util-0.3.6 Status: Vendor Tag: xorg Release Tags: xcb-util-0-3-6 N xsrc/external/mit/xcb-util/dist/xcb-util-common.h N xsrc/external/mit/xcb-util/dist/aclocal.m4 N xsrc/external/mit/xcb-util/dist/acinclude.m4 N xsrc/external/mit/xcb-util/dist/depcomp N xsrc/external/mit/xcb-util/dist/config.sub N xsrc/external/mit/xcb-util/dist/README N xsrc/external/mit/xcb-util/dist/xcb_util_intro.in N xsrc/external/mit/xcb-util/dist/ltmain.sh N xsrc/external/mit/xcb-util/dist/missing N xsrc/external/mit/xcb-util/dist/configure.ac N xsrc/external/mit/xcb-util/dist/configure N xsrc/external/mit/xcb-util/dist/config.guess N xsrc/external/mit/xcb-util/dist/Makefile.am N xsrc/external/mit/xcb-util/dist/Makefile.in N xsrc/external/mit/xcb-util/dist/install-sh N xsrc/external/mit/xcb-util/dist/reply/xcb-reply.pc.in N xsrc/external/mit/xcb-util/dist/reply/reply.c N xsrc/external/mit/xcb-util/dist/reply/test_reply.c N xsrc/external/mit/xcb-util/dist/reply/xcb_reply.h N xsrc/external/mit/xcb-util/dist/reply/Makefile.am N xsrc/external/mit/xcb-util/dist/reply/Makefile.in N xsrc/external/mit/xcb-util/dist/image/test_bitmap.c N xsrc/external/mit/xcb-util/dist/image/xcb_image.h N xsrc/external/mit/xcb-util/dist/image/test_xcb_image_shm.c N xsrc/external/mit/xcb-util/dist/image/xcb-image.pc.in N xsrc/external/mit/xcb-util/dist/image/test_swap.c N xsrc/external/mit/xcb-util/dist/image/xcb_pixel.h N xsrc/external/mit/xcb-util/dist/image/xcb_image.c N xsrc/external/mit/xcb-util/dist/image/Makefile.am N xsrc/external/mit/xcb-util/dist/image/test_formats.c N xsrc/external/mit/xcb-util/dist/image/test_xcb_image.c N xsrc/external/mit/xcb-util/dist/image/Makefile.in N xsrc/external/mit/xcb-util/dist/icccm/Makefile.am N xsrc/external/mit/xcb-util/dist/icccm/icccm.c N xsrc/external/mit/xcb-util/dist/icccm/xcb-icccm.pc.in N xsrc/external/mit/xcb-util/dist/icccm/xcb_icccm.h N xsrc/external/mit/xcb-util/dist/icccm/Makefile.in N xsrc/external/mit/xcb-util/dist/keysyms/xcb-keysyms.pc.in N xsrc/external/mit/xcb-util/dist/keysyms/keysyms.c N xsrc/external/mit/xcb-util/dist/keysyms/xcb_keysyms.h N xsrc/external/mit/xcb-util/dist/keysyms/Makefile.am N xsrc/external/mit/xcb-util/dist/keysyms/Makefile.in N xsrc/external/mit/xcb-util/dist/property/xcb-property.pc.in N xsrc/external/mit/xcb-util/dist/property/xcb_property.h N xsrc/external/mit/xcb-util/dist/property/property.c N xsrc/external/mit/xcb-util/dist/property/Makefile.am N xsrc/external/mit/xcb-util/dist/property/Makefile.in N xsrc/external/mit/xcb-util/dist/renderutil/xcb-renderutil.pc.in N xsrc/external/mit/xcb-util/dist/renderutil/glyph.c N xsrc/external/mit/xcb-util/dist/renderutil/util.c N xsrc/external/mit/xcb-util/dist/renderutil/cache.c N xsrc/external/mit/xcb-util/dist/renderutil/xcb_renderutil.h N xsrc/external/mit/xcb-util/dist/renderutil/Makefile.am N xsrc/external/mit/xcb-util/dist/renderutil/Makefile.in N xsrc/external/mit/xcb-util/dist/event/xcb-event.pc.in N xsrc/external/mit/xcb-util/dist/event/xcb_event.h N xsrc/external/mit/xcb-util/dist/event/Makefile.am N xsrc/external/mit/xcb-util/dist/event/event.c N xsrc/external/mit/xcb-util/dist/event/Makefile.in N xsrc/external/mit/xcb-util/dist/aux/xcb-aux.pc.in N xsrc/external/mit/xcb-util/dist/aux/xcb_aux.c N xsrc/external/mit/xcb-util/dist/aux/xcb_aux.h N xsrc/external/mit/xcb-util/dist/aux/Makefile.am N xsrc/external/mit/xcb-util/dist/aux/Makefile.in N xsrc/external/mit/xcb-util/dist/aux/xcb_bitops.h N xsrc/external/mit/xcb-util/dist/atom/xcb_atom.h.m4 N xsrc/external/mit/xcb-util/dist/atom/atomlist.m4 N xsrc/external/mit/xcb-util/dist/atom/xcb_atom.h N xsrc/external/mit/xcb-util/dist/atom/atoms.gperf.m4 N xsrc/external/mit/xcb-util/dist/atom/Makefile.am N xsrc/external/mit/xcb-util/dist/atom/Makefile.in N xsrc/external/mit/xcb-util/dist/atom/xcb-atom.pc.in N xsrc/external/mit/xcb-util/dist/atom/atoms.c No conflicts created by this import
CVS commit: xsrc/external/mit/libxcb/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 20:37:18 UTC 2010 Update of /cvsroot/xsrc/external/mit/libxcb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14186 Log Message: initial import of libxcb-1.6 Status: Vendor Tag: xorg Release Tags: libxcb-1-6 N xsrc/external/mit/libxcb/dist/xcb-dri2.pc.in N xsrc/external/mit/libxcb/dist/configure.ac N xsrc/external/mit/libxcb/dist/xcb-composite.pc.in N xsrc/external/mit/libxcb/dist/xcb-xprint.pc.in N xsrc/external/mit/libxcb/dist/xcb-damage.pc.in N xsrc/external/mit/libxcb/dist/xcb-xfixes.pc.in N xsrc/external/mit/libxcb/dist/Makefile.in N xsrc/external/mit/libxcb/dist/configure N xsrc/external/mit/libxcb/dist/NEWS N xsrc/external/mit/libxcb/dist/xcb-sync.pc.in N xsrc/external/mit/libxcb/dist/autogen.sh N xsrc/external/mit/libxcb/dist/xcb-xselinux.pc.in N xsrc/external/mit/libxcb/dist/xcb-randr.pc.in N xsrc/external/mit/libxcb/dist/xcb-screensaver.pc.in N xsrc/external/mit/libxcb/dist/xcb-xevie.pc.in N xsrc/external/mit/libxcb/dist/xcb.pc.in N xsrc/external/mit/libxcb/dist/xcb-render.pc.in N xsrc/external/mit/libxcb/dist/xcb-xinerama.pc.in N xsrc/external/mit/libxcb/dist/xcb-res.pc.in N xsrc/external/mit/libxcb/dist/xcb-record.pc.in N xsrc/external/mit/libxcb/dist/xcb-shape.pc.in N xsrc/external/mit/libxcb/dist/xcb-glx.pc.in N xsrc/external/mit/libxcb/dist/missing N xsrc/external/mit/libxcb/dist/xcb-xtest.pc.in N xsrc/external/mit/libxcb/dist/depcomp N xsrc/external/mit/libxcb/dist/xcb-xinput.pc.in N xsrc/external/mit/libxcb/dist/README N xsrc/external/mit/libxcb/dist/INSTALL N xsrc/external/mit/libxcb/dist/config.guess N xsrc/external/mit/libxcb/dist/xcb-xv.pc.in N xsrc/external/mit/libxcb/dist/COPYING N xsrc/external/mit/libxcb/dist/aclocal.m4 N xsrc/external/mit/libxcb/dist/Makefile.am N xsrc/external/mit/libxcb/dist/ltmain.sh N xsrc/external/mit/libxcb/dist/acinclude.m4 N xsrc/external/mit/libxcb/dist/xcb-xf86dri.pc.in N xsrc/external/mit/libxcb/dist/xcb-dpms.pc.in N xsrc/external/mit/libxcb/dist/xcb-shm.pc.in N xsrc/external/mit/libxcb/dist/xcb-xvmc.pc.in N xsrc/external/mit/libxcb/dist/config.sub N xsrc/external/mit/libxcb/dist/install-sh N xsrc/external/mit/libxcb/dist/tools/constants N xsrc/external/mit/libxcb/dist/tools/README N xsrc/external/mit/libxcb/dist/tools/api_conv.pl N xsrc/external/mit/libxcb/dist/src/xcb_list.c N xsrc/external/mit/libxcb/dist/src/xcb_in.c N xsrc/external/mit/libxcb/dist/src/Makefile.in N xsrc/external/mit/libxcb/dist/src/xcb_auth.c N xsrc/external/mit/libxcb/dist/src/xcb_ext.c N xsrc/external/mit/libxcb/dist/src/c_client.py N xsrc/external/mit/libxcb/dist/src/xcbint.h N xsrc/external/mit/libxcb/dist/src/xcb_conn.c N xsrc/external/mit/libxcb/dist/src/xcb_util.c N xsrc/external/mit/libxcb/dist/src/xcb_out.c N xsrc/external/mit/libxcb/dist/src/xcb.h N xsrc/external/mit/libxcb/dist/src/xcbext.h N xsrc/external/mit/libxcb/dist/src/Makefile.am N xsrc/external/mit/libxcb/dist/src/config.h.in N xsrc/external/mit/libxcb/dist/src/xcb_xid.c N xsrc/external/mit/libxcb/dist/tests/check_public.c N xsrc/external/mit/libxcb/dist/tests/Makefile.in N xsrc/external/mit/libxcb/dist/tests/CheckLog.xsl N xsrc/external/mit/libxcb/dist/tests/check_all.c N xsrc/external/mit/libxcb/dist/tests/check_suites.h N xsrc/external/mit/libxcb/dist/tests/Makefile.am N xsrc/external/mit/libxcb/dist/doc/Makefile.in N xsrc/external/mit/libxcb/dist/doc/xcb.doxygen.in N xsrc/external/mit/libxcb/dist/doc/Makefile.am N xsrc/external/mit/libxcb/dist/doc/tutorial/index.html N xsrc/external/mit/libxcb/dist/doc/tutorial/xcb.css No conflicts created by this import
CVS commit: xsrc/external/mit/xcb-proto/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 20:37:19 UTC 2010 Update of /cvsroot/xsrc/external/mit/xcb-proto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7548 Log Message: initial import of xcb-proto-1.6 Status: Vendor Tag: xorg Release Tags: xcb-proto-1-6 N xsrc/external/mit/xcb-proto/dist/aclocal.m4 N xsrc/external/mit/xcb-proto/dist/COPYING N xsrc/external/mit/xcb-proto/dist/TODO N xsrc/external/mit/xcb-proto/dist/README N xsrc/external/mit/xcb-proto/dist/NEWS N xsrc/external/mit/xcb-proto/dist/xcb-proto.pc.in N xsrc/external/mit/xcb-proto/dist/py-compile N xsrc/external/mit/xcb-proto/dist/configure.ac N xsrc/external/mit/xcb-proto/dist/missing N xsrc/external/mit/xcb-proto/dist/configure N xsrc/external/mit/xcb-proto/dist/Makefile.am N xsrc/external/mit/xcb-proto/dist/Makefile.in N xsrc/external/mit/xcb-proto/dist/INSTALL N xsrc/external/mit/xcb-proto/dist/install-sh N xsrc/external/mit/xcb-proto/dist/doc/xml-xcb.txt N xsrc/external/mit/xcb-proto/dist/xcbgen/__init__.py N xsrc/external/mit/xcb-proto/dist/xcbgen/state.py N xsrc/external/mit/xcb-proto/dist/xcbgen/matcher.py N xsrc/external/mit/xcb-proto/dist/xcbgen/error.py N xsrc/external/mit/xcb-proto/dist/xcbgen/Makefile.am N xsrc/external/mit/xcb-proto/dist/xcbgen/Makefile.in N xsrc/external/mit/xcb-proto/dist/xcbgen/xtypes.py N xsrc/external/mit/xcb-proto/dist/xcbgen/expr.py N xsrc/external/mit/xcb-proto/dist/src/screensaver.xml N xsrc/external/mit/xcb-proto/dist/src/xevie.xml N xsrc/external/mit/xcb-proto/dist/src/xinput.xml N xsrc/external/mit/xcb-proto/dist/src/xinerama.xml N xsrc/external/mit/xcb-proto/dist/src/shm.xml N xsrc/external/mit/xcb-proto/dist/src/xprint.xml N xsrc/external/mit/xcb-proto/dist/src/xselinux.xml N xsrc/external/mit/xcb-proto/dist/src/xcb.xsd N xsrc/external/mit/xcb-proto/dist/src/composite.xml N xsrc/external/mit/xcb-proto/dist/src/xproto.xml N xsrc/external/mit/xcb-proto/dist/src/res.xml N xsrc/external/mit/xcb-proto/dist/src/xtest.xml N xsrc/external/mit/xcb-proto/dist/src/damage.xml N xsrc/external/mit/xcb-proto/dist/src/dpms.xml N xsrc/external/mit/xcb-proto/dist/src/sync.xml N xsrc/external/mit/xcb-proto/dist/src/xc_misc.xml N xsrc/external/mit/xcb-proto/dist/src/randr.xml N xsrc/external/mit/xcb-proto/dist/src/dri2.xml N xsrc/external/mit/xcb-proto/dist/src/Makefile.am N xsrc/external/mit/xcb-proto/dist/src/record.xml N xsrc/external/mit/xcb-proto/dist/src/Makefile.in N xsrc/external/mit/xcb-proto/dist/src/xf86dri.xml N xsrc/external/mit/xcb-proto/dist/src/shape.xml N xsrc/external/mit/xcb-proto/dist/src/xvmc.xml N xsrc/external/mit/xcb-proto/dist/src/glx.xml N xsrc/external/mit/xcb-proto/dist/src/render.xml N xsrc/external/mit/xcb-proto/dist/src/xv.xml N xsrc/external/mit/xcb-proto/dist/src/xfixes.xml N xsrc/external/mit/xcb-proto/dist/src/bigreq.xml No conflicts created by this import
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: pgoyette
Date: Sat Jul 17 21:34:39 UTC 2010
Modified Files:
src/sys/arch/x86/x86: ipmi.c
Log Message:
Register ipmi(4) with power management subsystem so we might have a chance
of suspending. Suspending will still be denied if the watchdog is active.
As discussed on tech-kern@
XXX The pmf handlers for this and all other watchdogs should be factored
XXX out into a common handler for a generic wdog(4) pseudo-device, but
XXX that's left for the future.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/x86/x86/ipmi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/ipmi.c
diff -u src/sys/arch/x86/x86/ipmi.c:1.46 src/sys/arch/x86/x86/ipmi.c:1.47
--- src/sys/arch/x86/x86/ipmi.c:1.46 Sat Apr 10 19:02:39 2010
+++ src/sys/arch/x86/x86/ipmi.c Sat Jul 17 21:34:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi.c,v 1.46 2010/04/10 19:02:39 pgoyette Exp $ */
+/* $NetBSD: ipmi.c,v 1.47 2010/07/17 21:34:39 pgoyette Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipmi.c,v 1.46 2010/04/10 19:02:39 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipmi.c,v 1.47 2010/07/17 21:34:39 pgoyette Exp $);
#include sys/types.h
#include sys/param.h
@@ -225,6 +225,8 @@
int add_child_sensors(struct ipmi_softc *, uint8_t *, int, int, int,
int, int, int, const char *);
+bool ipmi_suspend(device_t, const pmf_qual_t *);
+
struct ipmi_if kcs_if = {
KCS,
IPMI_IF_KCS_NREGS,
@@ -1934,6 +1936,10 @@
sc-sc_wdog.smw_tickle = ipmi_watchdog_tickle;
sysmon_wdog_register(sc-sc_wdog);
+ /* Set up a power handler so we can possibly sleep */
+ if (!pmf_device_register(self, ipmi_suspend, NULL))
+aprint_error_dev(self, couldn't establish a power handler\n);
+
mutex_enter(sc-sc_poll_mtx);
while (sc-sc_thread_running) {
ipmi_refresh_sensors(sc);
@@ -2093,3 +2099,14 @@
device_xname(sc-sc_dev), rc);
}
}
+
+bool
+ipmi_suspend(device_t dev, const pmf_qual_t *qual)
+{
+ struct ipmi_softc *sc = device_private(dev);
+
+ /* Don't allow suspend if watchdog is armed */
+ if ((sc-sc_wdog.smw_mode WDOG_MODE_MASK) != WDOG_MODE_DISARMED)
+ return false;
+ return true;
+}
CVS commit: src/sys/dev/isa
Module Name:src
Committed By: pgoyette
Date: Sat Jul 17 21:36:26 UTC 2010
Modified Files:
src/sys/dev/isa: itesio_isa.c
Log Message:
If this itesio(4) has a watchdog, then set up a real suspend handler to
make sure we don't suspend when the wdog time is active.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/isa/itesio_isa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/isa/itesio_isa.c
diff -u src/sys/dev/isa/itesio_isa.c:1.18 src/sys/dev/isa/itesio_isa.c:1.19
--- src/sys/dev/isa/itesio_isa.c:1.18 Sun May 2 18:49:13 2010
+++ src/sys/dev/isa/itesio_isa.c Sat Jul 17 21:36:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: itesio_isa.c,v 1.18 2010/05/02 18:49:13 jakllsch Exp $ */
+/* $NetBSD: itesio_isa.c,v 1.19 2010/07/17 21:36:26 pgoyette Exp $ */
/* Derived from $OpenBSD: it.c,v 1.19 2006/04/10 00:57:54 deraadt Exp $ */
/*
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: itesio_isa.c,v 1.18 2010/05/02 18:49:13 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: itesio_isa.c,v 1.19 2010/07/17 21:36:26 pgoyette Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -92,6 +92,7 @@
static void itesio_refresh(struct sysmon_envsys *, envsys_data_t *);
/* sysmon_wdog glue */
+static bool itesio_wdt_suspend(device_t, const pmf_qual_t *);
static int itesio_wdt_setmode(struct sysmon_wdog *);
static int itesio_wdt_tickle(struct sysmon_wdog *);
@@ -250,9 +251,6 @@
}
sc-sc_hwmon_enabled = true;
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, couldn't establish power handler\n);
-
/* The IT8705 doesn't support the WDT */
if (sc-sc_chipid == ITESIO_ID8705)
goto out2;
@@ -272,12 +270,20 @@
}
sc-sc_wdt_enabled = true;
aprint_normal_dev(self, Watchdog Timer present\n);
+
+ if (!pmf_device_register(self, itesio_wdt_suspend, NULL))
+ aprint_error_dev(self, couldn't establish power handler\n);
+
return;
out:
bus_space_unmap(sc-sc_iot, sc-sc_ec_ioh, 8);
out2:
bus_space_unmap(sc-sc_iot, sc-sc_pnp_ioh, 2);
+
+ if (!pmf_device_register(self, NULL, NULL))
+ aprint_error_dev(self, couldn't establish power handler\n);
+
}
static int
@@ -297,6 +303,17 @@
return 0;
}
+static bool
+itesio_wdt_suspend(device_t dev, const pmf_qual_t *qual)
+{
+ struct itesio_softc *sc = device_private(dev);
+
+ /* Don't allow suspend if watchdog is armed */
+ if ((sc-sc_smw.smw_mode WDOG_MODE_MASK) != WDOG_MODE_DISARMED)
+ return false;
+ return true;
+}
+
/*
* Functions to read/write to the Environmental Controller.
*/
CVS commit: src/sys/dev/isa
Module Name:src Committed By: pgoyette Date: Sat Jul 17 21:51:43 UTC 2010 Modified Files: src/sys/dev/isa: itesio_isa.c Log Message: Put the original NULL pmf handler establishment back where it started, so as not to call it in some error paths. Instead, if there is a watchdog present, deregister the NULL handler before establishing the one for the watchdog. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/dev/isa/itesio_isa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/isa/itesio_isa.c diff -u src/sys/dev/isa/itesio_isa.c:1.19 src/sys/dev/isa/itesio_isa.c:1.20 --- src/sys/dev/isa/itesio_isa.c:1.19 Sat Jul 17 21:36:26 2010 +++ src/sys/dev/isa/itesio_isa.c Sat Jul 17 21:51:43 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: itesio_isa.c,v 1.19 2010/07/17 21:36:26 pgoyette Exp $ */ +/* $NetBSD: itesio_isa.c,v 1.20 2010/07/17 21:51:43 pgoyette Exp $ */ /* Derived from $OpenBSD: it.c,v 1.19 2006/04/10 00:57:54 deraadt Exp $ */ /* @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: itesio_isa.c,v 1.19 2010/07/17 21:36:26 pgoyette Exp $); +__KERNEL_RCSID(0, $NetBSD: itesio_isa.c,v 1.20 2010/07/17 21:51:43 pgoyette Exp $); #include sys/param.h #include sys/kernel.h @@ -251,6 +251,9 @@ } sc-sc_hwmon_enabled = true; + if (!pmf_device_register(self, NULL, NULL)) + aprint_error_dev(self, couldn't establish power handler\n); + /* The IT8705 doesn't support the WDT */ if (sc-sc_chipid == ITESIO_ID8705) goto out2; @@ -271,6 +274,7 @@ sc-sc_wdt_enabled = true; aprint_normal_dev(self, Watchdog Timer present\n); + pmf_device_deregister(self); if (!pmf_device_register(self, itesio_wdt_suspend, NULL)) aprint_error_dev(self, couldn't establish power handler\n); @@ -280,10 +284,6 @@ bus_space_unmap(sc-sc_iot, sc-sc_ec_ioh, 8); out2: bus_space_unmap(sc-sc_iot, sc-sc_pnp_ioh, 2); - - if (!pmf_device_register(self, NULL, NULL)) - aprint_error_dev(self, couldn't establish power handler\n); - } static int
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sat Jul 17 22:53:29 UTC 2010
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
- add X11SHAREDIR definition
- X11SRCDIR's for libxcb, xcb-proto and xcb-utils
To generate a diff of this commit:
cvs rdiff -u -r1.634 -r1.635 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.634 src/share/mk/bsd.own.mk:1.635
--- src/share/mk/bsd.own.mk:1.634 Sun Jul 11 06:16:54 2010
+++ src/share/mk/bsd.own.mk Sat Jul 17 22:53:29 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.634 2010/07/11 06:16:54 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.635 2010/07/17 22:53:29 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -892,6 +892,7 @@
X11INCDIR?= ${X11ROOTDIR}/include
X11LIBDIR?= ${X11ROOTDIR}/lib/X11
X11MANDIR?= ${X11ROOTDIR}/man
+X11SHAREDIR?= ${X11ROOTDIR}/share
X11USRLIBDIR?= ${X11ROOTDIR}/lib
#
@@ -902,14 +903,15 @@
FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xpm \
Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
- fontenc xkbfile xkbui Xaw lbxutil Xfontcache pciaccess
+ fontenc xkbfile xkbui Xaw lbxutil Xfontcache pciaccess xcb
X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib${_lib}/dist
.endfor
.for _proto in \
xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \
xinerama dri2 render resource record video xf86dga xf86misc \
- xf86vidmode composite damage trap gl randr fontcache xf86dri
+ xf86vidmode composite damage trap gl randr fontcache xf86dri \
+ xcb-
X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist
.endfor
@@ -928,7 +930,7 @@
xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo \
xwininfo xwud xprehashprinterlist xplsprinters xkbprint xkbevd \
xterm xwd xfs xfsinfo xphelloworld xtrap xkbutils xkbcomp \
- xkeyboard-config xinput \
+ xkeyboard-config xinput xcb-util \
font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi \
font-adobe-utopia-75dpi font-adobe-utopia-type1 \
font-alias \
CVS commit: src/external/mit/xorg/lib/libxcb
Module Name:src Committed By: mrg Date: Sat Jul 17 23:43:32 UTC 2010 Added Files: src/external/mit/xorg/lib/libxcb: Makefile xcb.mk src/external/mit/xorg/lib/libxcb/bigreq: Makefile src/external/mit/xorg/lib/libxcb/composite: Makefile src/external/mit/xorg/lib/libxcb/damage: Makefile src/external/mit/xorg/lib/libxcb/dpms: Makefile src/external/mit/xorg/lib/libxcb/dri2: Makefile src/external/mit/xorg/lib/libxcb/files: Makefile Makefile.xmlsrcs bigreq.c bigreq.h composite.c composite.h config.h damage.c damage.h dpms.c dpms.h dri2.c dri2.h glx.c glx.h randr.c randr.h record.c record.h render.c render.h res.c res.h screensaver.c screensaver.h shape.c shape.h shm.c shm.h sync.c sync.h xc_misc.c xc_misc.h xevie.c xevie.h xf86dri.c xf86dri.h xfixes.c xfixes.h xinerama.c xinerama.h xinput.c xinput.h xproto.c xproto.h xselinux.c xselinux.h xtest.c xtest.h xv.c xv.h xvmc.c xvmc.h src/external/mit/xorg/lib/libxcb/glx: Makefile src/external/mit/xorg/lib/libxcb/libxcb: Makefile shlib_version src/external/mit/xorg/lib/libxcb/randr: Makefile src/external/mit/xorg/lib/libxcb/record: Makefile src/external/mit/xorg/lib/libxcb/render: Makefile src/external/mit/xorg/lib/libxcb/res: Makefile src/external/mit/xorg/lib/libxcb/screensaver: Makefile src/external/mit/xorg/lib/libxcb/shape: Makefile src/external/mit/xorg/lib/libxcb/shm: Makefile src/external/mit/xorg/lib/libxcb/sync: Makefile src/external/mit/xorg/lib/libxcb/xc_misc: Makefile src/external/mit/xorg/lib/libxcb/xevie: Makefile src/external/mit/xorg/lib/libxcb/xf86dri: Makefile src/external/mit/xorg/lib/libxcb/xfixes: Makefile src/external/mit/xorg/lib/libxcb/xinerama: Makefile src/external/mit/xorg/lib/libxcb/xinput: Makefile src/external/mit/xorg/lib/libxcb/xproto: Makefile src/external/mit/xorg/lib/libxcb/xtest: Makefile src/external/mit/xorg/lib/libxcb/xv: Makefile src/external/mit/xorg/lib/libxcb/xvmc: Makefile Log Message: build support for libxcb 1.6. not yet used. XXX: i couldn't get the python/xml generator to run outside of XXX: the libxcb build tree, so i just copied these from there, XXX: but ideally files/Makefile could know how to do this. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libxcb/Makefile \ src/external/mit/xorg/lib/libxcb/xcb.mk cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libxcb/bigreq/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libxcb/composite/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libxcb/damage/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libxcb/dpms/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libxcb/dri2/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libxcb/files/Makefile \ src/external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs \ src/external/mit/xorg/lib/libxcb/files/bigreq.c \ src/external/mit/xorg/lib/libxcb/files/bigreq.h \ src/external/mit/xorg/lib/libxcb/files/composite.c \ src/external/mit/xorg/lib/libxcb/files/composite.h \ src/external/mit/xorg/lib/libxcb/files/config.h \ src/external/mit/xorg/lib/libxcb/files/damage.c \ src/external/mit/xorg/lib/libxcb/files/damage.h \ src/external/mit/xorg/lib/libxcb/files/dpms.c \ src/external/mit/xorg/lib/libxcb/files/dpms.h \ src/external/mit/xorg/lib/libxcb/files/dri2.c \ src/external/mit/xorg/lib/libxcb/files/dri2.h \ src/external/mit/xorg/lib/libxcb/files/glx.c \ src/external/mit/xorg/lib/libxcb/files/glx.h \ src/external/mit/xorg/lib/libxcb/files/randr.c \ src/external/mit/xorg/lib/libxcb/files/randr.h \ src/external/mit/xorg/lib/libxcb/files/record.c \ src/external/mit/xorg/lib/libxcb/files/record.h \ src/external/mit/xorg/lib/libxcb/files/render.c \ src/external/mit/xorg/lib/libxcb/files/render.h \ src/external/mit/xorg/lib/libxcb/files/res.c \ src/external/mit/xorg/lib/libxcb/files/res.h \ src/external/mit/xorg/lib/libxcb/files/screensaver.c \ src/external/mit/xorg/lib/libxcb/files/screensaver.h \ src/external/mit/xorg/lib/libxcb/files/shape.c \ src/external/mit/xorg/lib/libxcb/files/shape.h \ src/external/mit/xorg/lib/libxcb/files/shm.c \ src/external/mit/xorg/lib/libxcb/files/shm.h \ src/external/mit/xorg/lib/libxcb/files/sync.c \ src/external/mit/xorg/lib/libxcb/files/sync.h \ src/external/mit/xorg/lib/libxcb/files/xc_misc.c \ src/external/mit/xorg/lib/libxcb/files/xc_misc.h \ src/external/mit/xorg/lib/libxcb/files/xevie.c \ src/external/mit/xorg/lib/libxcb/files/xevie.h \ src/external/mit/xorg/lib/libxcb/files/xf86dri.c \ src/external/mit/xorg/lib/libxcb/files/xf86dri.h \
CVS commit: src/external/mit/xorg/include/xcb-proto
Module Name:src
Committed By: mrg
Date: Sat Jul 17 23:44:29 UTC 2010
Added Files:
src/external/mit/xorg/include/xcb-proto: Makefile
Log Message:
install the xcb-proto files; not used yet.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/include/xcb-proto/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/include/xcb-proto/Makefile
diff -u /dev/null src/external/mit/xorg/include/xcb-proto/Makefile:1.1
--- /dev/null Sat Jul 17 23:44:29 2010
+++ src/external/mit/xorg/include/xcb-proto/Makefile Sat Jul 17 23:44:29 2010
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2010/07/17 23:44:29 mrg Exp $
+
+.include bsd.own.mk
+
+.PATH: ${X11SRCDIR.xcb-proto} ${X11SRCDIR.xcb-proto}/src
+
+FILES= bigreq.xml composite.xml damage.xml dpms.xml dri2.xml \
+ glx.xml randr.xml record.xml render.xml res.xml \
+ screensaver.xml shape.xml shm.xml sync.xml xc_misc.xml \
+ xcb.xsd xevie.xml xf86dri.xml xfixes.xml xinerama.xml \
+ xinput.xml xprint.xml xproto.xml xselinux.xml xtest.xml \
+ xv.xml xvmc.xml
+FILESDIR=${X11SHAREDIR}/xcb
+
+PKGCONFIG= xcb-proto
+
+NOPROG= # defined
+
+.include bsd.x11.mk
+.include bsd.files.mk
+.include bsd.prog.mk
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: jakllsch
Date: Sun Jul 18 03:00:39 UTC 2010
Modified Files:
src/sys/dev/mii: rgephy.c rgephyreg.h
Log Message:
Use standard MII register definitions from mii.h. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mii/rgephy.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/mii/rgephyreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/rgephy.c
diff -u src/sys/dev/mii/rgephy.c:1.28 src/sys/dev/mii/rgephy.c:1.29
--- src/sys/dev/mii/rgephy.c:1.28 Sun Aug 23 13:41:06 2009
+++ src/sys/dev/mii/rgephy.c Sun Jul 18 03:00:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephy.c,v 1.28 2009/08/23 13:41:06 tsutsui Exp $ */
+/* $NetBSD: rgephy.c,v 1.29 2010/07/18 03:00:39 jakllsch Exp $ */
/*
* Copyright (c) 2003
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rgephy.c,v 1.28 2009/08/23 13:41:06 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: rgephy.c,v 1.29 2010/07/18 03:00:39 jakllsch Exp $);
/*
@@ -203,9 +203,8 @@
rgephy_reset(sc); /* XXX hardware bug work-around */
- anar = PHY_READ(sc, RGEPHY_MII_ANAR);
- anar = ~(RGEPHY_ANAR_TX_FD | RGEPHY_ANAR_TX |
- RGEPHY_ANAR_10_FD | RGEPHY_ANAR_10);
+ anar = PHY_READ(sc, MII_ANAR);
+ anar = ~(ANAR_TX_FD | ANAR_TX | ANAR_10_FD | ANAR_10);
switch (IFM_SUBTYPE(ife-ifm_media)) {
case IFM_AUTO:
@@ -213,38 +212,37 @@
/*
* If we're already in auto mode, just return.
*/
- if (PHY_READ(sc, RGEPHY_MII_BMCR) RGEPHY_BMCR_AUTOEN)
+ if (PHY_READ(sc, MII_BMCR) BMCR_AUTOEN)
return 0;
#endif
(void)rgephy_mii_phy_auto(sc);
break;
case IFM_1000_T:
- speed = RGEPHY_S1000;
+ speed = BMCR_S1000;
goto setit;
case IFM_100_TX:
- speed = RGEPHY_S100;
- anar |= RGEPHY_ANAR_TX_FD | RGEPHY_ANAR_TX;
+ speed = BMCR_S100;
+ anar |= ANAR_TX_FD | ANAR_TX;
goto setit;
case IFM_10_T:
- speed = RGEPHY_S10;
- anar |= RGEPHY_ANAR_10_FD | RGEPHY_ANAR_10;
+ speed = BMCR_S10;
+ anar |= ANAR_10_FD | ANAR_10;
setit:
rgephy_loop(sc);
if ((ife-ifm_media IFM_GMASK) == IFM_FDX) {
-speed |= RGEPHY_BMCR_FDX;
-gig = RGEPHY_1000CTL_AFD;
-anar = ~(RGEPHY_ANAR_TX | RGEPHY_ANAR_10);
+speed |= BMCR_FDX;
+gig = GTCR_ADV_1000TFDX;
+anar = ~(ANAR_TX | ANAR_10);
} else {
-gig = RGEPHY_1000CTL_AHD;
-anar =
-~(RGEPHY_ANAR_TX_FD | RGEPHY_ANAR_10_FD);
+gig = GTCR_ADV_1000THDX;
+anar = ~(ANAR_TX_FD | ANAR_10_FD);
}
if (IFM_SUBTYPE(ife-ifm_media) != IFM_1000_T) {
-PHY_WRITE(sc, RGEPHY_MII_1000CTL, 0);
-PHY_WRITE(sc, RGEPHY_MII_ANAR, anar);
-PHY_WRITE(sc, RGEPHY_MII_BMCR, speed |
-RGEPHY_BMCR_AUTOEN | RGEPHY_BMCR_STARTNEG);
+PHY_WRITE(sc, MII_100T2CR, 0);
+PHY_WRITE(sc, MII_ANAR, anar);
+PHY_WRITE(sc, MII_BMCR, speed |
+BMCR_AUTOEN | BMCR_STARTNEG);
break;
}
@@ -257,14 +255,13 @@
* be a master, otherwise it's a slave.
*/
if ((mii-mii_ifp-if_flags IFF_LINK0)) {
-PHY_WRITE(sc, RGEPHY_MII_1000CTL,
-gig|RGEPHY_1000CTL_MSE|RGEPHY_1000CTL_MSC);
+PHY_WRITE(sc, MII_100T2CR,
+gig|GTCR_MAN_MS|GTCR_ADV_MS);
} else {
-PHY_WRITE(sc, RGEPHY_MII_1000CTL,
-gig|RGEPHY_1000CTL_MSE);
+PHY_WRITE(sc, MII_100T2CR, gig|GTCR_MAN_MS);
}
- PHY_WRITE(sc, RGEPHY_MII_BMCR, speed |
- RGEPHY_BMCR_AUTOEN | RGEPHY_BMCR_STARTNEG);
+ PHY_WRITE(sc, MII_BMCR, speed |
+ BMCR_AUTOEN | BMCR_STARTNEG);
break;
case IFM_NONE:
PHY_WRITE(sc, MII_BMCR, BMCR_ISO|BMCR_PDOWN);
@@ -366,20 +363,20 @@
mii-mii_media_status |= IFM_ACTIVE;
}
- bmsr = PHY_READ(sc, RGEPHY_MII_BMSR);
- bmcr = PHY_READ(sc, RGEPHY_MII_BMCR);
+ bmsr = PHY_READ(sc, MII_BMSR);
+ bmcr = PHY_READ(sc, MII_BMCR);
- if ((bmcr RGEPHY_BMCR_ISO) != 0) {
+ if ((bmcr BMCR_ISO) != 0) {
mii-mii_media_active |= IFM_NONE;
mii-mii_media_status = 0;
return;
}
- if ((bmcr RGEPHY_BMCR_LOOP) != 0)
+ if ((bmcr BMCR_LOOP) != 0)
mii-mii_media_active |= IFM_LOOP;
- if ((bmcr RGEPHY_BMCR_AUTOEN) != 0) {
- if ((bmsr RGEPHY_BMSR_ACOMP) == 0) {
+ if ((bmcr BMCR_AUTOEN) != 0) {
+ if ((bmsr BMSR_ACOMP) == 0) {
/* Erg, still trying, I guess... */
mii-mii_media_active |= IFM_NONE;
return;
@@ -436,15 +433,13 @@
anar = BMSR_MEDIA_TO_ANAR(mii-mii_capabilities) | ANAR_CSMA;
if (mii-mii_flags MIIF_DOPAUSE)
- anar |= RGEPHY_ANAR_PC | RGEPHY_ANAR_ASP;
+ anar |= ANAR_FC | ANAR_X_PAUSE_ASYM;
- PHY_WRITE(mii, RGEPHY_MII_ANAR, anar);
+ PHY_WRITE(mii, MII_ANAR, anar);
DELAY(1000);
- PHY_WRITE(mii, RGEPHY_MII_1000CTL,
- RGEPHY_1000CTL_AHD | RGEPHY_1000CTL_AFD);
+ PHY_WRITE(mii, MII_100T2CR, GTCR_ADV_1000THDX | GTCR_ADV_1000TFDX);
DELAY(1000);
- PHY_WRITE(mii, RGEPHY_MII_BMCR,
- RGEPHY_BMCR_AUTOEN | RGEPHY_BMCR_STARTNEG);
+ PHY_WRITE(mii, MII_BMCR, BMCR_AUTOEN |
