PERFORCE change 36825 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Aug 23 23:31:23 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=36825
Change 36825 by marcel at marcel_nfs on 2003/08/23 23:30:45
IFC @36822
Affected files ...
.. //depot/projects/uart/conf/files.i386#7 integrate
.. //depot/projects/uart/conf/files.sparc64#4 integrate
.. //depot/projects/uart/conf/options.sparc64#3 integrate
.. //depot/projects/uart/dev/aic/aic.c#3 integrate
.. //depot/projects/uart/dev/fb/creator.c#1 branch
.. //depot/projects/uart/dev/fb/fb.c#2 integrate
.. //depot/projects/uart/dev/fb/fbreg.h#2 integrate
.. //depot/projects/uart/dev/fb/gallant12x22.h#1 branch
.. //depot/projects/uart/dev/gem/if_gem.c#3 integrate
.. //depot/projects/uart/dev/owi/if_ieee80211.h#1 branch
.. //depot/projects/uart/dev/owi/if_owi.c#1 branch
.. //depot/projects/uart/dev/owi/if_owi_pccard.c#1 branch
.. //depot/projects/uart/dev/owi/if_wireg.h#1 branch
.. //depot/projects/uart/dev/owi/if_wivar.h#1 branch
.. //depot/projects/uart/dev/sound/pci/ds1.c#4 integrate
.. //depot/projects/uart/dev/sound/pcm/ac97.c#3 integrate
.. //depot/projects/uart/dev/sound/pcm/feeder_fmt.c#2 integrate
.. //depot/projects/uart/dev/syscons/scgfbrndr.c#2 integrate
.. //depot/projects/uart/dev/syscons/schistory.c#2 integrate
.. //depot/projects/uart/dev/syscons/scmouse.c#2 integrate
.. //depot/projects/uart/dev/syscons/scterm-dumb.c#2 integrate
.. //depot/projects/uart/dev/syscons/scterm-sc.c#2 integrate
.. //depot/projects/uart/dev/syscons/scvidctl.c#2 integrate
.. //depot/projects/uart/dev/syscons/syscons.c#2 integrate
.. //depot/projects/uart/dev/syscons/syscons.h#2 integrate
.. //depot/projects/uart/dev/wi/if_wi_pccard.c#8 integrate
.. //depot/projects/uart/i386/isa/stallion.c#2 integrate
.. //depot/projects/uart/ia64/conf/Makefile#1 branch
.. //depot/projects/uart/ia64/conf/NOTES#1 branch
.. //depot/projects/uart/kern/kern_timeout.c#2 integrate
.. //depot/projects/uart/kern/kern_xxx.c#2 integrate
.. //depot/projects/uart/kern/vfs_bio.c#3 integrate
.. //depot/projects/uart/modules/agp/Makefile#2 integrate
.. //depot/projects/uart/modules/owi/Makefile#1 branch
.. //depot/projects/uart/netsmb/smb_conn.c#2 integrate
.. //depot/projects/uart/netsmb/smb_iod.c#2 integrate
.. //depot/projects/uart/netsmb/smb_subr.h#2 integrate
.. //depot/projects/uart/pc98/pc98/clock.c#4 integrate
.. //depot/projects/uart/pci/agp_nvidia.c#1 branch
.. //depot/projects/uart/pci/agpreg.h#2 integrate
.. //depot/projects/uart/pci/if_xl.c#7 integrate
.. //depot/projects/uart/pci/meteor.c#4 integrate
.. //depot/projects/uart/sparc64/creator/creator.h#1 branch
.. //depot/projects/uart/sparc64/creator/creator_upa.c#1 branch
.. //depot/projects/uart/sparc64/include/sc_machdep.h#1 branch
.. //depot/projects/uart/sparc64/sparc64/sc_machdep.c#1 branch
.. //depot/projects/uart/vm/vm_fault.c#2 integrate
.. //depot/projects/uart/vm/vm_page.c#4 integrate
.. //depot/projects/uart/vm/vm_page.h#2 integrate
.. //depot/projects/uart/vm/vnode_pager.c#4 integrate
Differences ...
==== //depot/projects/uart/conf/files.i386#7 (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
@@ -394,3 +394,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/uart/conf/files.sparc64#4 (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
dev/uart/uart_cpu_sparc64.c optional uart
geom/geom_bsd.c standard
geom/geom_bsd_enc.c standard
@@ -26,6 +40,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
@@ -76,6 +91,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/uart/conf/options.sparc64#3 (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/uart/dev/aic/aic.c#3 (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/uart/dev/fb/fb.c#2 (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/uart/dev/fb/fbreg.h#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/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/uart/dev/gem/if_gem.c#3 (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/uart/dev/sound/pci/ds1.c#4 (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/uart/dev/sound/pcm/ac97.c#3 (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/uart/dev/sound/pcm/feeder_fmt.c#2 (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/uart/dev/syscons/scgfbrndr.c#2 (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/uart/dev/syscons/schistory.c#2 (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/uart/dev/syscons/scmouse.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/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/uart/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/uart/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/uart/dev/syscons/scvidctl.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/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"
@@ -654,7 +654,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
@@ -783,7 +783,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/uart/dev/syscons/syscons.c#2 (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;
@@ -1379,7 +1389,7 @@
/* initialize required fields */
cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLECTL);
-#endif /* __i386__ || __ia64__ || __amd64__ */
+#endif /* __i386__ || __ia64__ || __amd64__ || __sparc64__ */
#if __alpha__
/*
@@ -1394,7 +1404,7 @@
static void
sccninit(struct consdev *cp)
{
-#if __i386__ || __ia64__ || __amd64__
+#if __i386__ || __ia64__ || __amd64__ || __sparc64__
int unit;
int flags;
@@ -1402,7 +1412,7 @@
scinit(unit, flags | SC_KERNEL_CONSOLE);
sc_console_unit = unit;
sc_console = SC_STAT(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]);
-#endif /* __i386__ || __ia64__ || __amd64__ */
+#endif /* __i386__ || __ia64__ || __amd64__ || __sparc64__ */
#if __alpha__
/* SHOULDN'T REACH HERE */
@@ -1417,7 +1427,7 @@
if (sc_console_unit < 0)
return; /* shouldn't happen */
-#if __i386__ || __ia64__ || __amd64__
+#if __i386__ || __ia64__ || __amd64__ || __sparc64__
#if 0 /* XXX */
sc_clear_screen(sc_console);
sccnupdate(sc_console);
@@ -1425,7 +1435,7 @@
scterm(sc_console_unit, SC_KERNEL_CONSOLE);
sc_console_unit = -1;
sc_console = NULL;
-#endif /* __i386__ || __ia64__ || __amd64__ */
+#endif /* __i386__ || __ia64__ || __amd64__ || __sparc64__ */
#if __alpha__
/* do nothing XXX */
@@ -2446,9 +2456,11 @@
scp = sc->cur_scp = sc->new_scp;
if (sc->old_scp->mode != scp->mode || ISUNKNOWNSC(sc->old_scp))
set_mode(scp);
+#ifndef __sparc64__
else
sc_vtb_init(&scp->scr, VTB_FRAMEBUFFER, scp->xsize, scp->ysize,
(void *)sc->adp->va_window, FALSE);
+#endif
scp->status |= MOUSE_HIDDEN;
sc_move_cursor(scp, scp->xpos, scp->ypos);
if (!ISGRAPHSC(scp))
@@ -2715,11 +2727,13 @@
SC_STAT(sc->dev[0]) = scp;
sc->cur_scp = scp;
+#ifndef __sparc64__
/* copy screen to temporary buffer */
sc_vtb_init(&scp->scr, VTB_FRAMEBUFFER, scp->xsize, scp->ysize,
(void *)scp->sc->adp->va_window, FALSE);
if (ISTEXTSC(scp))
sc_vtb_copy(&scp->scr, 0, &scp->vtb, 0, scp->xsize*scp->ysize);
+#endif
/* move cursors to the initial positions */
if (col >= scp->xsize)
@@ -2806,7 +2820,7 @@
sc->flags |= SC_INIT_DONE;
}
-#if __i386__ || __ia64__ || __amd64__
+#if __i386__ || __ia64__ || __amd64__ || __sparc64__
static void
scterm(int unit, int flags)
{
@@ -2862,7 +2876,7 @@
sc->keyboard = -1;
sc->adapter = -1;
}
-#endif /* __i386__ || __ia64__ || __amd64__ */
+#endif /* __i386__ || __ia64__ || __amd64__ || __sparc64__ */
static void
scshutdown(void *arg, int howto)
@@ -2975,22 +2989,21 @@
scp->ysize = info.vi_height;
scp->xpixel = scp->xsize*info.vi_cwidth;
scp->ypixel = scp->ysize*info.vi_cheight;
+ scp->font_size = info.vi_cheight;
+ scp->font_width = info.vi_cwidth;
if (info.vi_cheight < 14) {
- scp->font_size = 8;
#ifndef SC_NO_FONT_LOADING
scp->font = sc->font_8;
#else
scp->font = NULL;
#endif
} else if (info.vi_cheight >= 16) {
- scp->font_size = 16;
#ifndef SC_NO_FONT_LOADING
scp->font = sc->font_16;
#else
scp->font = NULL;
#endif
} else {
- scp->font_size = 14;
#ifndef SC_NO_FONT_LOADING
scp->font = sc->font_14;
#else
@@ -2999,7 +3012,9 @@
}
}
sc_vtb_init(&scp->vtb, VTB_MEMORY, 0, 0, NULL, FALSE);
+#ifndef __sparc64__
sc_vtb_init(&scp->scr, VTB_FRAMEBUFFER, 0, 0, NULL, FALSE);
+#endif
scp->xoff = scp->yoff = 0;
scp->xpos = scp->ypos = 0;
scp->start = scp->xsize * scp->ysize - 1;
@@ -3441,8 +3456,10 @@
/* setup video hardware for the given mode */
(*vidsw[scp->sc->adapter]->set_mode)(scp->sc->adp, scp->mode);
+#ifndef __sparc64__
sc_vtb_init(&scp->scr, VTB_FRAMEBUFFER, scp->xsize, scp->ysize,
(void *)scp->sc->adp->va_window, FALSE);
+#endif
#ifndef SC_NO_FONT_LOADING
/* load appropriate font */
==== //depot/projects/uart/dev/syscons/syscons.h#2 (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.h,v 1.75 2002/07/10 03:29:38 dd Exp $
+ * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.77 2003/08/24 04:04:44 jake Exp $
*/
#ifndef _DEV_SYSCONS_SYSCONS_H_
@@ -256,7 +256,9 @@
int index; /* index of this vty */
struct sc_softc *sc; /* pointer to softc */
struct sc_rndr_sw *rndr; /* renderer */
+#ifndef __sparc64__
sc_vtb_t scr;
+#endif
sc_vtb_t vtb;
int xpos; /* current X position */
@@ -270,6 +272,7 @@
u_char *font; /* current font */
int font_size; /* fontsize in Y direction */
+ int font_width; /* fontsize in X direction */
int start; /* modified area start */
int end; /* modified area end */
==== //depot/projects/uart/dev/wi/if_wi_pccard.c#8 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.36 2003/08/21 17:40:59 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.38 2003/08/24 05:18:10 imp Exp $");
#include "opt_wi.h"
==== //depot/projects/uart/i386/isa/stallion.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/stallion.c,v 1.56 2003/06/02 16:32:55 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/stallion.c,v 1.57 2003/08/23 16:59:16 imp Exp $");
/*****************************************************************************/
@@ -62,8 +62,8 @@
#ifndef COMPAT_OLDPCI
#error "The stallion pci driver requires the old pci compatibility shims"
#endif
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
#endif
/*****************************************************************************/
==== //depot/projects/uart/kern/kern_timeout.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.79 2003/06/20 08:39:04 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.80 2003/08/23 08:31:32 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -231,9 +231,9 @@
maxdt = bt2.frac;
bintime2timespec(&bt2, &ts2);
printf(
- "Expensive timeout(9) function: %p(%p) %d.%09ld s\n",
+ "Expensive timeout(9) function: %p(%p) %ld.%09ld s\n",
c_func, c_arg,
- ts2.tv_sec, ts2.tv_nsec);
+ (long)ts2.tv_sec, ts2.tv_nsec);
}
#endif
if (!(c_flags & CALLOUT_MPSAFE))
==== //depot/projects/uart/kern/kern_xxx.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.37 2003/06/11 00:56:57 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.38 2003/08/23 15:45:57 tjr Exp $");
#include "opt_compat.h"
@@ -144,11 +144,12 @@
{
int error;
+ if ((error = suser(td)))
+ return (error);
mtx_lock(&Giant);
- if ((error = suser(td)))
- hostid = uap->hostid;
+ hostid = uap->hostid;
mtx_unlock(&Giant);
- return (error);
+ return (0);
}
/*
==== //depot/projects/uart/kern/vfs_bio.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.396 2003/08/02 09:45:10 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.397 2003/08/23 18:11:52 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1351,7 +1351,9 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list