Date: Sat, 23 Aug 2003 23:27:15 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 36824 for review Message-ID: <200308240627.h7O6RF3s003913@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=36824 Change 36824 by marcel@marcel_nfs on 2003/08/23 23:27:05 IFC @36822 Affected files ... .. //depot/projects/ia64/contrib/smbfs/smbutil/common.h#4 integrate .. //depot/projects/ia64/etc/Makefile#33 integrate .. //depot/projects/ia64/etc/defaults/Makefile#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#120 integrate .. //depot/projects/ia64/share/timedef/zh_CN.GB18030.src#2 integrate .. //depot/projects/ia64/share/timedef/zh_CN.eucCN.src#2 integrate .. //depot/projects/ia64/sys/conf/files.i386#44 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#33 integrate .. //depot/projects/ia64/sys/conf/options.sparc64#8 integrate .. //depot/projects/ia64/sys/dev/aic/aic.c#8 integrate .. //depot/projects/ia64/sys/dev/fb/creator.c#1 branch .. //depot/projects/ia64/sys/dev/fb/fb.c#10 integrate .. //depot/projects/ia64/sys/dev/fb/fbreg.h#8 integrate .. //depot/projects/ia64/sys/dev/fb/gallant12x22.h#1 branch .. //depot/projects/ia64/sys/dev/gem/if_gem.c#16 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme.c#14 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme_sbus.c#6 integrate .. //depot/projects/ia64/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/ia64/sys/dev/owi/if_ieee80211.h#1 branch .. //depot/projects/ia64/sys/dev/owi/if_owi.c#1 branch .. //depot/projects/ia64/sys/dev/owi/if_owi_pccard.c#1 branch .. //depot/projects/ia64/sys/dev/owi/if_wireg.h#1 branch .. //depot/projects/ia64/sys/dev/owi/if_wivar.h#1 branch .. //depot/projects/ia64/sys/dev/sound/pci/ds1.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#20 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder_fmt.c#7 integrate .. //depot/projects/ia64/sys/dev/syscons/scgfbrndr.c#4 integrate .. //depot/projects/ia64/sys/dev/syscons/schistory.c#5 integrate .. //depot/projects/ia64/sys/dev/syscons/scmouse.c#9 integrate .. //depot/projects/ia64/sys/dev/syscons/scterm-dumb.c#2 integrate .. //depot/projects/ia64/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/ia64/sys/dev/syscons/scvidctl.c#5 integrate .. //depot/projects/ia64/sys/dev/syscons/syscons.c#20 integrate .. //depot/projects/ia64/sys/dev/syscons/syscons.h#4 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#29 integrate .. //depot/projects/ia64/sys/i386/isa/stallion.c#8 integrate .. //depot/projects/ia64/sys/ia64/conf/Makefile#1 branch .. //depot/projects/ia64/sys/ia64/conf/NOTES#1 branch .. //depot/projects/ia64/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#56 integrate .. //depot/projects/ia64/sys/modules/agp/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/owi/Makefile#1 branch .. //depot/projects/ia64/sys/netsmb/smb_conn.c#8 integrate .. //depot/projects/ia64/sys/netsmb/smb_iod.c#12 integrate .. //depot/projects/ia64/sys/netsmb/smb_subr.h#9 integrate .. //depot/projects/ia64/sys/pc98/pc98/clock.c#19 integrate .. //depot/projects/ia64/sys/pci/agp_nvidia.c#1 branch .. //depot/projects/ia64/sys/pci/agpreg.h#7 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#39 integrate .. //depot/projects/ia64/sys/pci/meteor.c#11 integrate .. //depot/projects/ia64/sys/sparc64/creator/creator.h#1 branch .. //depot/projects/ia64/sys/sparc64/creator/creator_upa.c#1 branch .. //depot/projects/ia64/sys/sparc64/include/sc_machdep.h#1 branch .. //depot/projects/ia64/sys/sparc64/sparc64/eeprom.c#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/eeprom_ebus.c#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/eeprom_fhc.c#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/eeprom_sbus.c#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/sc_machdep.c#1 branch .. //depot/projects/ia64/sys/vm/vm_fault.c#35 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#52 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#22 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#37 integrate Differences ... ==== //depot/projects/ia64/contrib/smbfs/smbutil/common.h#4 (text+ko) ==== @@ -1,7 +1,7 @@ -/* $FreeBSD: src/contrib/smbfs/smbutil/common.h,v 1.2 2003/05/03 19:22:47 obrien Exp $ */ +/* $FreeBSD: src/contrib/smbfs/smbutil/common.h,v 1.3 2003/08/23 13:05:13 tjr Exp $ */ #define iprintf(ident,args...) do { printf("%-" # ident "s", ""); \ - printf(# args);}while(0) + printf(args);}while(0) extern int verbose; ==== //depot/projects/ia64/etc/Makefile#33 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.316 2003/08/18 00:36:31 obrien Exp $ +# $FreeBSD: src/etc/Makefile,v 1.317 2003/08/24 03:24:54 mtm Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -32,8 +32,6 @@ # -rwxr-xr-x root:wheel, for the new cron root:wheel BIN2= netstart pccard_ether rc.suspend rc.resume -DEFAULTS= rc.conf pccard.conf periodic.conf - MTREE= BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \ BSD.var.dist BSD.x11.dist BSD.x11-4.dist .if !defined(NO_SENDMAIL) @@ -71,8 +69,7 @@ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd - cd ${.CURDIR}/defaults; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${DEFAULTS} ${DESTDIR}/etc/defaults + cd ${.CURDIR}/defaults; ${MAKE} install cd ${.CURDIR}/periodic; ${MAKE} install cd ${.CURDIR}/rc.d; ${MAKE} install cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall @@ -197,7 +194,7 @@ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${BIN1} ${BIN2} nsmb.conf opieaccess \ ${DESTDIR}/usr/share/examples/etc - cd ${.CURDIR}/defaults; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${DEFAULTS} ${DESTDIR}/usr/share/examples/etc/defaults + cd ${.CURDIR}/defaults; ${MAKE} install \ + DESTDIR=${DESTDIR}/usr/share/examples .include <bsd.prog.mk> ==== //depot/projects/ia64/etc/defaults/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/etc/defaults/Makefile,v 1.2 2003/08/20 06:15:18 mtm Exp $ +# $FreeBSD: src/etc/defaults/Makefile,v 1.3 2003/08/24 03:24:54 mtm Exp $ FILES= devfs.rules pccard.conf periodic.conf rc.conf NOOBJ= noobj FILESDIR= /etc/defaults -FILESMODE= 644 +FILESMODE= 444 .include <bsd.prog.mk> ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#120 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The FreeBSD Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.618 2003/08/22 22:24:12 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.619 2003/08/23 05:42:03 nyan Exp $</pubdate> <copyright> <year>2000</year> @@ -190,7 +190,7 @@ panics on PAE machines of certain large memory sizes has been corrected.</para> - <para arch="i368">Floating point emulation in the kernel has + <para arch="i386,pc98">Floating point emulation in the kernel has been removed.</para> </sect3> ==== //depot/projects/ia64/share/timedef/zh_CN.GB18030.src#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/timedef/zh_CN.GB18030.src,v 1.1 2003/07/29 16:12:55 ache Exp $ +# $FreeBSD: src/share/timedef/zh_CN.GB18030.src,v 1.2 2003/08/23 20:46:23 ache Exp $ # # WARNING: spaces may be essential at the end of lines # WARNING: empty lines are essential too @@ -35,13 +35,13 @@ # # Short weekday names # -周日 -周一 -周二 -周三 -周四 -周五 -周六 +日 +一 +二 +三 +四 +五 +六 # # Long weekday names # ==== //depot/projects/ia64/share/timedef/zh_CN.eucCN.src#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/timedef/zh_CN.eucCN.src,v 1.11 2001/03/21 23:24:41 ache Exp $ +# $FreeBSD: src/share/timedef/zh_CN.eucCN.src,v 1.12 2003/08/23 20:46:23 ache Exp $ # # WARNING: spaces may be essential at the end of lines # WARNING: empty lines are essential too @@ -35,13 +35,13 @@ # # Short weekday names # -周日 -周一 -周二 -周三 -周四 -周五 -周六 +日 +一 +二 +三 +四 +五 +六 # # Long weekday names # ==== //depot/projects/ia64/sys/conf/files.i386#44 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.451 2003/08/15 14:56:05 phk Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.452 2003/08/23 18:00:31 mdodd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -393,3 +393,4 @@ pci/agp_ali.c optional agp pci/agp_amd.c optional agp pci/agp_i810.c optional agp +pci/agp_nvidia.c optional agp ==== //depot/projects/ia64/sys/conf/files.sparc64#33 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.44 2003/07/01 14:52:46 tmm Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.45 2003/08/24 01:54:06 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -12,12 +12,26 @@ crypto/des/des_enc.c optional ipsec ipsec_esp crypto/blowfish/bf_enc.c optional crypto crypto/des/des_enc.c optional crypto +dev/fb/creator.c optional creator sc +dev/fb/fb.c optional sc +dev/fb/splash.c optional splash +dev/kbd/kbd.c optional sc dev/ofw/ofw_console.c optional ofw_console dev/ofw/openfirm.c standard dev/ofw/openfirmio.c standard dev/ofw/openpromio.c standard dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa +dev/syscons/scgfbrndr.c optional sc +dev/syscons/schistory.c optional sc +dev/syscons/scmouse.c optional sc +dev/syscons/scterm.c optional sc +dev/syscons/scterm-dumb.c optional sc +dev/syscons/scterm-sc.c optional sc +dev/syscons/scvidctl.c optional sc +dev/syscons/scvtb.c optional sc +dev/syscons/syscons.c optional sc +dev/syscons/sysmouse.c optional sc geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_sunlabel.c standard @@ -25,6 +39,7 @@ libkern/ffs.c standard kern/syscalls.c optional ktr sparc64/central/central.c optional central +sparc64/creator/creator_upa.c optional creator sc sparc64/ebus/ebus.c optional ebus sparc64/fhc/fhc.c optional fhc sparc64/fhc/fhc_central.c optional fhc central @@ -75,6 +90,7 @@ sparc64/sparc64/pmap.c standard sparc64/sparc64/prof_machdep.c optional profiling-routine sparc64/sparc64/rwindow.c standard +sparc64/sparc64/sc_machdep.c optional sc sparc64/sparc64/spitfire.c standard sparc64/sparc64/support.S standard sparc64/sparc64/sys_machdep.c standard ==== //depot/projects/ia64/sys/conf/options.sparc64#8 (text+ko) ==== @@ -1,7 +1,11 @@ -# $FreeBSD: src/sys/conf/options.sparc64,v 1.7 2003/07/01 14:52:46 tmm Exp $ +# $FreeBSD: src/sys/conf/options.sparc64,v 1.8 2003/08/24 01:54:06 jake Exp $ SUN4U opt_global.h +GFB_DEBUG opt_gfb.h +GFB_NO_FONT_LOADING opt_gfb.h +GFB_NO_MODE_CHANGE opt_gfb.h + EBUS_DEBUG opt_ebus.h PSYCHO_DEBUG opt_psycho.h DEBUGGER_ON_POWERFAIL opt_psycho.h @@ -12,3 +16,5 @@ # Debug IOMMU inserts/removes using diagnostic accesses. Very loud. IOMMU_DIAG opt_iommu.h PMAP_STATS opt_pmap.h + +DEV_CREATOR opt_creator.h ==== //depot/projects/ia64/sys/dev/aic/aic.c#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aic/aic.c,v 1.20 2003/08/22 05:51:23 imp Exp $ + * $FreeBSD: src/sys/dev/aic/aic.c,v 1.21 2003/08/23 09:00:56 marcel Exp $ */ #include <sys/param.h> @@ -490,6 +490,7 @@ CAM_DEBUG_PRINT(CAM_DEBUG_TRACE, ("aic_reconnect\n")); /* Find the nexus */ + scb = NULL; TAILQ_FOREACH(ccb_h, &aic->nexus_ccbs, sim_links.tqe) { scb = (struct aic_scb *)ccb_h->ccb_scb_ptr; if (scb->target == aic->target && scb->lun == aic->lun && ==== //depot/projects/ia64/sys/dev/fb/fb.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fb/fb.c,v 1.26 2003/03/25 00:07:00 jake Exp $ + * $FreeBSD: src/sys/dev/fb/fb.c,v 1.27 2003/08/24 02:42:01 jake Exp $ */ #include "opt_fb.h" @@ -509,7 +509,7 @@ offset, paddr, nprot); } -DEV_DRIVER_MODULE(fb, ???, fb_driver, fb_devclass, fb_cdevsw, 0, 0); +DEV_DRIVER_MODULE(fb, foo, fb_driver, fb_devclass, fb_cdevsw, 0, 0); #endif /* ==== //depot/projects/ia64/sys/dev/fb/fbreg.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.15 2003/05/01 04:21:05 peter Exp $ + * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.16 2003/08/23 08:52:52 marcel Exp $ */ #ifndef _DEV_FB_FBREG_H_ @@ -59,17 +59,16 @@ #define bcopy_toio(s, d, c) \ bus_space_write_region_1(IA64_BUS_SPACE_MEM, d, 0, (void*)(s), c) #define bzero_io(d, c) \ - bus_space_set_region_1(IA64_BUS_SPACE_MEM, d, 0, 0, c) + bus_space_set_region_1(IA64_BUS_SPACE_MEM, (intptr_t)(d), 0, 0, c) #define fill_io(p, d, c) \ - bus_space_set_region_1(IA64_BUS_SPACE_MEM, d, 0, p, c) + bus_space_set_region_1(IA64_BUS_SPACE_MEM, (intptr_t)(d), 0, p, c) #define fillw_io(p, d, c) \ - bus_space_set_region_2(IA64_BUS_SPACE_MEM, d, 0, p, c) -#define readw(a) \ - bus_space_read_2(IA64_BUS_SPACE_MEM, a, 0) -#define writew(a, v) \ - bus_space_write_2(IA64_BUS_SPACE_MEM, a, 0, v) -#define writel(a, v) \ - bus_space_write_4(IA64_BUS_SPACE_MEM, a, 0, v) + bus_space_set_region_2(IA64_BUS_SPACE_MEM, (intptr_t)(d), 0, p, c) +#define readb(a) bus_space_read_1(IA64_BUS_SPACE_MEM, a, 0) +#define readw(a) bus_space_read_2(IA64_BUS_SPACE_MEM, a, 0) +#define writeb(a, v) bus_space_write_1(IA64_BUS_SPACE_MEM, a, 0, v) +#define writew(a, v) bus_space_write_2(IA64_BUS_SPACE_MEM, a, 0, v) +#define writel(a, v) bus_space_write_4(IA64_BUS_SPACE_MEM, a, 0, v) static __inline void fillw(int val, uint16_t *buf, size_t size) { ==== //depot/projects/ia64/sys/dev/gem/if_gem.c#16 (text+ko) ==== @@ -26,7 +26,7 @@ * * from: NetBSD: gem.c,v 1.21 2002/06/01 23:50:58 lukem Exp * - * $FreeBSD: src/sys/dev/gem/if_gem.c,v 1.17 2003/07/01 15:51:57 scottl Exp $ + * $FreeBSD: src/sys/dev/gem/if_gem.c,v 1.18 2003/08/23 06:30:21 imp Exp $ */ /* @@ -60,8 +60,8 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <gem/if_gemreg.h> -#include <gem/if_gemvar.h> +#include <dev/gem/if_gemreg.h> +#include <dev/gem/if_gemvar.h> #define TRIES 10000 ==== //depot/projects/ia64/sys/dev/hme/if_hme.c#14 (text+ko) ==== @@ -36,7 +36,7 @@ * * from: NetBSD: hme.c,v 1.20 2000/12/14 06:27:25 thorpej Exp * - * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.14 2003/07/01 15:51:57 scottl Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.15 2003/08/23 05:51:03 marcel Exp $ */ /* @@ -82,8 +82,8 @@ #include <machine/bus.h> -#include <hme/if_hmereg.h> -#include <hme/if_hmevar.h> +#include <dev/hme/if_hmereg.h> +#include <dev/hme/if_hmevar.h> static void hme_start(struct ifnet *); static void hme_stop(struct hme_softc *); ==== //depot/projects/ia64/sys/dev/hme/if_hme_pci.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ * * from: NetBSD: if_hme_pci.c,v 1.4 2001/08/27 22:18:49 augustss Exp * - * $FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.8 2003/08/22 06:00:26 imp Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.9 2003/08/23 05:51:03 marcel Exp $ */ /* @@ -53,14 +53,14 @@ #include <net/if_dl.h> #include <net/if_media.h> -#include <mii/mii.h> -#include <mii/miivar.h> +#include <dev/mii/mii.h> +#include <dev/mii/miivar.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <hme/if_hmereg.h> -#include <hme/if_hmevar.h> +#include <dev/hme/if_hmereg.h> +#include <dev/hme/if_hmevar.h> #include "miibus_if.h" ==== //depot/projects/ia64/sys/dev/hme/if_hme_sbus.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ * * from: NetBSD: if_hme_sbus.c,v 1.9 2001/11/13 06:58:17 lukem Exp * - * $FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.5 2003/08/23 00:11:16 imp Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.6 2003/08/23 05:51:03 marcel Exp $ */ /* @@ -63,13 +63,13 @@ #include <net/if_dl.h> #include <net/if_media.h> -#include <mii/mii.h> -#include <mii/miivar.h> +#include <dev/mii/mii.h> +#include <dev/mii/miivar.h> #include <sparc64/sbus/sbusvar.h> -#include <hme/if_hmereg.h> -#include <hme/if_hmevar.h> +#include <dev/hme/if_hmereg.h> +#include <dev/hme/if_hmevar.h> #include "miibus_if.h" ==== //depot/projects/ia64/sys/dev/mk48txx/mk48txx.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * * $NetBSD: mk48txx.c,v 1.7 2001/04/08 17:05:10 tsutsui Exp $ * - * $FreeBSD: src/sys/dev/mk48txx/mk48txx.c,v 1.1 2002/04/04 23:44:42 tmm Exp $ + * $FreeBSD: src/sys/dev/mk48txx/mk48txx.c,v 1.2 2003/08/23 05:54:06 marcel Exp $ */ /* @@ -50,7 +50,7 @@ #include <machine/bus.h> -#include <mk48txx/mk48txxreg.h> +#include <dev/mk48txx/mk48txxreg.h> #include "clock_if.h" ==== //depot/projects/ia64/sys/dev/sound/pci/ds1.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ #include <dev/sound/pci/ds1.h> #include <dev/sound/pci/ds1-fw.h> -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.34 2003/08/22 07:04:10 imp Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.35 2003/08/23 13:00:48 iedowse Exp $"); /* -------------------------------------------------------------------- */ @@ -526,12 +526,13 @@ ds1pchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize) { struct sc_pchinfo *ch = data; + struct sc_info *sc = ch->parent; int drate; /* irq rate is fixed at 187.5hz */ drate = ch->spd * sndbuf_getbps(ch->buffer); - blocksize = (drate << 8) / DS1_IRQHZ; - sndbuf_resize(ch->buffer, DS1_BUFFSIZE / blocksize, blocksize); + blocksize = roundup2((drate << 8) / DS1_IRQHZ, 4); + sndbuf_resize(ch->buffer, sc->bufsz / blocksize, blocksize); return blocksize; } @@ -653,12 +654,13 @@ ds1rchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize) { struct sc_rchinfo *ch = data; + struct sc_info *sc = ch->parent; int drate; /* irq rate is fixed at 187.5hz */ drate = ch->spd * sndbuf_getbps(ch->buffer); - blocksize = (drate << 8) / DS1_IRQHZ; - sndbuf_resize(ch->buffer, DS1_BUFFSIZE / blocksize, blocksize); + blocksize = roundup2((drate << 8) / DS1_IRQHZ, 4); + sndbuf_resize(ch->buffer, sc->bufsz / blocksize, blocksize); return blocksize; } ==== //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#20 (text+ko) ==== @@ -30,7 +30,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.44 2003/08/21 23:22:51 orion Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.45 2003/08/23 21:39:51 orion Exp $"); MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); @@ -443,16 +443,16 @@ static void ac97_fix_auxout(struct ac97_info *codec) { + int keep_ogain; + /* - * Determine if AUX_OUT is a valid control. + * By default, The ac97 aux_out register (0x04) corresponds to OSS's + * OGAIN setting. * - * Control will read zero if not valid after a reset, other gain - * controls read muted (0x8000). + * We first check whether aux_out is a valid register. If not + * we may not want to keep ogain. */ - if (ac97_rdcd(codec, AC97_MIX_AUXOUT) == 0) { - bzero(&codec->mix[SOUND_MIXER_OGAIN], - sizeof(codec->mix[SOUND_MIXER_OGAIN])); - } + keep_ogain = ac97_rdcd(codec, AC97_MIX_AUXOUT) & 0x8000; /* * Determine what AUX_OUT really means, it can be: @@ -465,13 +465,13 @@ */ if (codec->extcaps & AC97_EXTCAP_SDAC && ac97_rdcd(codec, AC97_MIXEXT_SURROUND) == 0x8080) { - codec->mix[SOUND_MIXER_VOLUME].reg = AC97_MIXEXT_SURROUND; - } else if (codec->caps & AC97_CAP_HEADPHONE) { - /* Headphone out present/selected AUX_OUT is effectively - * master volume control. */ - struct ac97mixtable_entry tmp = codec->mix[SOUND_MIXER_VOLUME]; - codec->mix[SOUND_MIXER_VOLUME] = codec->mix[SOUND_MIXER_OGAIN]; - codec->mix[SOUND_MIXER_OGAIN] = tmp; + codec->mix[SOUND_MIXER_OGAIN].reg = AC97_MIXEXT_SURROUND; + keep_ogain = 1; + } + + if (keep_ogain == 0) { + bzero(&codec->mix[SOUND_MIXER_OGAIN], + sizeof(codec->mix[SOUND_MIXER_OGAIN])); } } ==== //depot/projects/ia64/sys/dev/sound/pcm/feeder_fmt.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.11 2003/04/20 17:08:56 orion Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.12 2003/08/23 12:18:30 iedowse Exp $"); MALLOC_DEFINE(M_FMTFEEDER, "fmtfeed", "pcm format feeder"); @@ -291,7 +291,7 @@ j = k - 1; i = j * 2 + 1; - while (i > 3 && j >= 1) { + while (i >= 3 && j >= 1) { x = b[j--]; y = b[j--]; b[i--] = x; ==== //depot/projects/ia64/sys/dev/syscons/scgfbrndr.c#4 (text+ko) ==== @@ -27,10 +27,11 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.16 2002/04/13 22:34:16 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.17 2003/08/24 02:31:55 jake Exp $"); #include "opt_syscons.h" #include "opt_gfb.h" +#include "opt_creator.h" #include <sys/param.h> #include <sys/systm.h> @@ -128,8 +129,8 @@ static void gfb_draw(scr_stat *scp, int from, int count, int flip) { - char c; - char a; + int c; + int a; int i, n; video_adapter_t *adp; @@ -181,7 +182,7 @@ c = sc_vtb_getc(&scp->vtb, from); a = sc_vtb_geta(&scp->vtb, from) >> 8; (*vidsw[scp->sc->adapter]->putc)(adp, from, c, - a); + (a >> 4) | ((a & 0xf) << 4)); } else { (*vidsw[scp->sc->adapter]->puts)(adp, from, @@ -207,13 +208,14 @@ static int pxlblinkrate = 0; -#if 0 +#ifdef DEV_CREATOR static void gfb_cursor(scr_stat *scp, int at, int blink, int on, int flip) { video_adapter_t *adp; + int a, c; - if (scp->cursor_height <= 0) /* the text cursor is disabled */ + if (scp->curs_attr.height <= 0) /* the text cursor is disabled */ return; adp = scp->sc->adp; @@ -234,11 +236,16 @@ scp->status &= ~VR_CURSOR_BLINK; if(on) { scp->status |= VR_CURSOR_ON; - scp->cursor_saveunder_char = sc_vtb_getc(&scp->scr, at); - scp->cursor_saveunder_attr = sc_vtb_geta(&scp->scr, at); + (*vidsw[scp->sc->adapter]->putc)(scp->sc->adp, + scp->cursor_oldpos, + sc_vtb_getc(&scp->vtb, scp->cursor_oldpos), + sc_vtb_geta(&scp->vtb, scp->cursor_oldpos) >> 8); + a = sc_vtb_geta(&scp->vtb, at) >> 8; + c = sc_vtb_getc(&scp->vtb, at); (*vidsw[scp->sc->adapter]->putc)(scp->sc->adp, at, - scp->cursor_saveunder_char, - scp->cursor_saveunder_attr); + c, (a >> 4) | ((a & 0xf) << 4)); + scp->cursor_saveunder_attr = a; + scp->cursor_saveunder_char = c; } else { if (scp->status & VR_CURSOR_ON) (*vidsw[scp->sc->adapter]->putc)(scp->sc->adp, @@ -248,8 +255,7 @@ } } } -#endif - +#else static void gfb_cursor(scr_stat *scp, int at, int blink, int on, int flip) { @@ -286,6 +292,7 @@ else scp->status &= ~VR_CURSOR_BLINK; } +#endif static void gfb_blink(scr_stat *scp, int at, int flip) ==== //depot/projects/ia64/sys/dev/syscons/schistory.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/syscons/schistory.c,v 1.16 2003/02/19 05:47:12 imp Exp $ + * $FreeBSD: src/sys/dev/syscons/schistory.c,v 1.17 2003/08/24 00:44:00 jake Exp $ */ #include "opt_syscons.h" @@ -41,7 +41,11 @@ #include <sys/kernel.h> #include <sys/malloc.h> +#ifdef __sparc64__ +#include <machine/sc_machdep.h> +#else #include <machine/pc/display.h> +#endif #include <dev/syscons/syscons.h> ==== //depot/projects/ia64/sys/dev/syscons/scmouse.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/syscons/scmouse.c,v 1.34 2003/06/01 04:42:14 jmallett Exp $ + * $FreeBSD: src/sys/dev/syscons/scmouse.c,v 1.35 2003/08/24 04:04:44 jake Exp $ */ #include "opt_syscons.h" @@ -129,7 +129,8 @@ scp->mouse_pos = scp->mouse_oldpos = 0; else scp->mouse_pos = scp->mouse_oldpos = - (y/scp->font_size - scp->yoff)*scp->xsize + x/8 - scp->xoff; + (y/scp->font_size - scp->yoff)*scp->xsize + x/scp->font_width - + scp->xoff; scp->status |= MOUSE_MOVED; splx(s); } @@ -138,8 +139,8 @@ static void set_mouse_pos(scr_stat *scp) { - if (scp->mouse_xpos < scp->xoff*8) - scp->mouse_xpos = scp->xoff*8; + if (scp->mouse_xpos < scp->xoff*scp->font_width) + scp->mouse_xpos = scp->xoff*scp->font_width; if (scp->mouse_ypos < scp->yoff*scp->font_size) scp->mouse_ypos = scp->yoff*scp->font_size; if (ISGRAPHSC(scp)) { @@ -149,8 +150,8 @@ scp->mouse_ypos = scp->ypixel-1; return; } else { - if (scp->mouse_xpos > (scp->xsize + scp->xoff)*8 - 1) - scp->mouse_xpos = (scp->xsize + scp->xoff)*8 - 1; + if (scp->mouse_xpos > (scp->xsize + scp->xoff)*scp->font_width - 1) + scp->mouse_xpos = (scp->xsize + scp->xoff)*scp->font_width - 1; if (scp->mouse_ypos > (scp->ysize + scp->yoff)*scp->font_size - 1) scp->mouse_ypos = (scp->ysize + scp->yoff)*scp->font_size - 1; } @@ -159,7 +160,7 @@ scp->status |= MOUSE_MOVED; scp->mouse_pos = (scp->mouse_ypos/scp->font_size - scp->yoff)*scp->xsize - + scp->mouse_xpos/8 - scp->xoff; + + scp->mouse_xpos/scp->font_width - scp->xoff; #ifndef SC_NO_CUTPASTE if ((scp->status & MOUSE_VISIBLE) && (scp->status & MOUSE_CUTTING)) mouse_cut(scp); @@ -195,7 +196,8 @@ ++scp->sc->videoio_in_progress; (*scp->rndr->draw_mouse)(scp, - (scp->mouse_oldpos%scp->xsize + scp->xoff)*8, + (scp->mouse_oldpos%scp->xsize + scp->xoff) + * scp->font_width, (scp->mouse_oldpos/scp->xsize + scp->yoff) * scp->font_size, FALSE); ==== //depot/projects/ia64/sys/dev/syscons/scterm-dumb.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/syscons/scterm-dumb.c,v 1.3 2000/04/29 15:35:19 phk Exp $ + * $FreeBSD: src/sys/dev/syscons/scterm-dumb.c,v 1.4 2003/08/24 00:44:00 jake Exp $ */ #include "opt_syscons.h" @@ -32,7 +32,11 @@ #include <sys/systm.h> #include <sys/consio.h> +#ifdef __sparc64__ +#include <machine/sc_machdep.h> +#else #include <machine/pc/display.h> +#endif #include <dev/syscons/syscons.h> #include <dev/syscons/sctermvar.h> ==== //depot/projects/ia64/sys/dev/syscons/scterm-sc.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/syscons/scterm-sc.c,v 1.17 2001/09/12 08:37:13 julian Exp $ + * $FreeBSD: src/sys/dev/syscons/scterm-sc.c,v 1.18 2003/08/24 00:44:00 jake Exp $ */ #include "opt_syscons.h" @@ -34,7 +34,11 @@ #include <sys/kernel.h> #include <sys/consio.h> +#ifdef __sparc64__ +#include <machine/sc_machdep.h> +#else #include <machine/pc/display.h> +#endif #include <dev/syscons/syscons.h> #include <dev/syscons/sctermvar.h> ==== //depot/projects/ia64/sys/dev/syscons/scvidctl.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/syscons/scvidctl.c,v 1.29 2002/08/25 13:17:01 charnier Exp $ + * $FreeBSD: src/sys/dev/syscons/scvidctl.c,v 1.30 2003/08/24 00:35:10 jake Exp $ */ #include "opt_syscons.h" @@ -664,7 +664,7 @@ #endif /* SC_NO_MODE_CHANGE */ case KDSETMODE: /* set current mode of this (virtual) console */ - switch (*(int *)data) { + switch (*(intptr_t *)data) { case KD_TEXT: /* switch to TEXT (known) mode */ /* * If scp->mode is of graphics modes, we don't know which @@ -793,7 +793,7 @@ return 0; case KDSBORDER: /* set border color of this (virtual) console */ - scp->border = *data; + scp->border = *(intptr_t *)data; if (scp == scp->sc->cur_scp) sc_set_border(scp, scp->border); return 0; ==== //depot/projects/ia64/sys/dev/syscons/syscons.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.402 2003/05/09 18:24:40 peter Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.405 2003/08/24 04:04:44 jake Exp $ */ #include "opt_syscons.h" @@ -53,7 +53,11 @@ #include <sys/power.h> #include <machine/clock.h> +#ifdef __sparc64__ +#include <machine/sc_machdep.h> +#else #include <machine/pc/display.h> +#endif #ifdef __i386__ #include <machine/psl.h> #include <machine/apm_bios.h> @@ -145,7 +149,7 @@ static int scparam(struct tty *tp, struct termios *t); static void scstart(struct tty *tp); static void scinit(int unit, int flags); -#if __i386__ || __ia64__ || __amd64__ +#if __i386__ || __ia64__ || __amd64__ || __sparc64__ static void scterm(int unit, int flags); #endif static void scshutdown(void *arg, int howto); @@ -452,7 +456,9 @@ sc_softc_t *sc; struct tty *tp; scr_stat *scp; +#ifndef __sparc64__ keyarg_t key; +#endif int error; DPRINTF(5, ("scopen: dev:%d,%d, unit:%d, vty:%d\n", @@ -471,11 +477,13 @@ ttychars(tp); /* Use the current setting of the <-- key as default VERASE. */ /* If the Delete key is preferable, an stty is necessary */ +#ifndef __sparc64__ if (sc->kbd != NULL) { key.keynum = KEYCODE_BS; kbd_ioctl(sc->kbd, GIO_KEYMAPENT, (caddr_t)&key); tp->t_cc[VERASE] = key.key.map[0]; } +#endif tp->t_iflag = TTYDEF_IFLAG; tp->t_oflag = TTYDEF_OFLAG; tp->t_cflag = TTYDEF_CFLAG; @@ -530,7 +538,9 @@ } else { sc_vtb_destroy(&scp->vtb); +#ifndef __sparc64__ sc_vtb_destroy(&scp->scr); +#endif sc_free_history_buffer(scp, scp->ysize); SC_STAT(dev) = NULL; free(scp, M_DEVBUF); @@ -961,7 +971,7 @@ return EPERM; } error = EINVAL; - switch(*(int *)data) { + switch(*(intptr_t *)data) { case VT_FALSE: /* user refuses to release screen, abort */ if ((error = finish_vt_rel(scp, FALSE, &s)) == 0) DPRINTF(5, ("sc%d: VT_FALSE\n", sc->unit)); @@ -991,14 +1001,14 @@ return EINVAL; case VT_ACTIVATE: /* switch to screen *data */ - i = (*(int *)data == 0) ? scp->index : (*(int *)data - 1); + i = (*(intptr_t *)data == 0) ? scp->index : (*(intptr_t *)data - 1); s = spltty(); sc_clean_up(sc->cur_scp); splx(s); return sc_switch_scr(sc, i); case VT_WAITACTIVE: /* wait for switch to occur */ - i = (*(int *)data == 0) ? scp->index : (*(int *)data - 1); + i = (*(intptr_t *)data == 0) ? scp->index : (*(intptr_t *)data - 1); if ((i < sc->first_vty) || (i >= sc->first_vty + sc->vtys)) return EINVAL; s = spltty(); @@ -1361,7 +1371,7 @@ static void sccnprobe(struct consdev *cp) { -#if __i386__ || __ia64__ || __amd64__ +#if __i386__ || __ia64__ || __amd64__ || __sparc64__ int unit; int flags; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308240627.h7O6RF3s003913>