CVS commit: src/sys/arch/sgimips/gio
Module Name:src Committed By: macallan Date: Sat May 4 00:45:18 UTC 2019 Modified Files: src/sys/arch/sgimips/gio: newportreg.h Log Message: moar registers to the right branch this time (hopefully) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sgimips/gio/newportreg.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/sgimips/gio/newportreg.h diff -u src/sys/arch/sgimips/gio/newportreg.h:1.6 src/sys/arch/sgimips/gio/newportreg.h:1.7 --- src/sys/arch/sgimips/gio/newportreg.h:1.6 Wed Jan 11 21:23:07 2012 +++ src/sys/arch/sgimips/gio/newportreg.h Sat May 4 00:45:18 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: newportreg.h,v 1.6 2012/01/11 21:23:07 macallan Exp $ */ +/* $NetBSD: newportreg.h,v 1.7 2019/05/04 00:45:18 macallan Exp $ */ /* * Copyright (c) 2003 Ilpo Ruotsalainen @@ -143,6 +143,7 @@ #define REX3_REG_ZPATTERN 0x0014 #define REX3_REG_COLORBACK 0x0018 +#define REX3_REG_COLORVRAM 0x001c #define REX3_REG_XSTART 0x0100 @@ -191,6 +192,17 @@ #define REX3_REG_TOPSCAN 0x1320 #define REX3_REG_XYWIN 0x1324 +#define REX3_REG_CLIPMODE 0x1328 +#define REX3_CLIPMODE_SMASK0 0x0001 +#define REX3_CLIPMODE_SMASK1 0x0002 +#define REX3_CLIPMODE_SMASK2 0x0004 +#define REX3_CLIPMODE_SMASK3 0x0008 +#define REX3_CLIPMODE_SMASK4 0x0010 +#define REX3_CLIPMODE_CIDMATCH0 0x0100 +#define REX3_CLIPMODE_CIDMATCH1 0x0200 +#define REX3_CLIPMODE_CIDMATCH2 0x0400 +#define REX3_CLIPMODE_CIDMATCH3 0x0800 + #define REX3_REG_STATUS 0x1338 #define REX3_STATUS_GFXBUSY 0x0008 @@ -261,6 +273,10 @@ #define XMAP9_DCBCRS_PUP_CMAP 4 #define XMAP9_DCBCRS_MODE_SETUP 5 #define XMAP9_MODE_GAMMA_BYPASS 0x04 +#define XMAP9_MODE_PIXMODE_CI 0x00 +#define XMAP9_MODE_PIXMODE_RGB0 0x000100 +#define XMAP9_MODE_PIXMODE_RGB1 0x000200 +#define XMAP9_MODE_PIXMODE_RGB2 0x000300 #define XMAP9_MODE_PIXSIZE_8BPP 0x000400 #define XMAP9_MODE_PIXSIZE_24BPP 0x000c00 #define XMAP9_DCBCRS_MODE_SELECT 7
CVS commit: src/sys/arch/sgimips/gio
Module Name:src
Committed By: mrg
Date: Sun Mar 4 21:42:28 UTC 2018
Modified Files:
src/sys/arch/sgimips/gio: grtwo.c
Log Message:
#if 0 grtwo_cursor_data[] to match the #if 0'd code that uses it.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sgimips/gio/grtwo.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/sgimips/gio/grtwo.c
diff -u src/sys/arch/sgimips/gio/grtwo.c:1.13 src/sys/arch/sgimips/gio/grtwo.c:1.14
--- src/sys/arch/sgimips/gio/grtwo.c:1.13 Sat Oct 27 17:18:09 2012
+++ src/sys/arch/sgimips/gio/grtwo.c Sun Mar 4 21:42:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: grtwo.c,v 1.13 2012/10/27 17:18:09 chs Exp $ */
+/* $NetBSD: grtwo.c,v 1.14 2018/03/04 21:42:28 mrg Exp $ */
/*
* Copyright (c) 2004 Christopher SEKIYA
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: grtwo.c,v 1.13 2012/10/27 17:18:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grtwo.c,v 1.14 2018/03/04 21:42:28 mrg Exp $");
#include
#include
@@ -156,6 +156,7 @@ static int grtwo_is_console = 0;
#define GR2_ATTR_BG(a) ((a) & 0xff)
#define GR2_ATTR_FG(a) (((a) >> 8) & 0xff)
+#if 0
static const u_int16_t grtwo_cursor_data[128] = {
/* Bit 0 */
0xff00, 0x,
@@ -225,6 +226,7 @@ static const u_int16_t grtwo_cursor_data
0x, 0x,
0x, 0x,
};
+#endif
static const u_int8_t grtwo_defcmap[8 * 3] = {
/* Normal colors */
CVS commit: src/sys/arch/sgimips/gio
Module Name:src Committed By: christos Date: Sat Jun 3 14:46:51 UTC 2017 Modified Files: src/sys/arch/sgimips/gio: devlist2h.awk Log Message: remove my copyright To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sgimips/gio/devlist2h.awk 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/sgimips/gio/devlist2h.awk diff -u src/sys/arch/sgimips/gio/devlist2h.awk:1.5 src/sys/arch/sgimips/gio/devlist2h.awk:1.6 --- src/sys/arch/sgimips/gio/devlist2h.awk:1.5 Fri May 2 14:11:05 2008 +++ src/sys/arch/sgimips/gio/devlist2h.awk Sat Jun 3 10:46:51 2017 @@ -1,5 +1,5 @@ #! /usr/bin/awk -f -# $NetBSD: devlist2h.awk,v 1.5 2008/05/02 18:11:05 martin Exp $ +# $NetBSD: devlist2h.awk,v 1.6 2017/06/03 14:46:51 christos Exp $ # # Copyright (c) 1998 The NetBSD Foundation, Inc. # All rights reserved. @@ -42,7 +42,6 @@ # 3. All advertising materials mentioning features or use of this software #must display the following acknowledgement: # This product includes software developed by Christopher G. Demetriou. -# This product includes software developed by Christos Zoulas # 4. The name of the author(s) may not be used to endorse or promote products #derived from this software without specific prior written permission #
CVS commit: src/sys/arch/sgimips/gio
Module Name:src
Committed By: macallan
Date: Wed Jul 20 22:16:37 UTC 2016
Modified Files:
src/sys/arch/sgimips/gio: gio.c
Log Message:
use bus_space_map() instead of fudging our own bus_space_handle_t
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sgimips/gio/gio.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/sgimips/gio/gio.c
diff -u src/sys/arch/sgimips/gio/gio.c:1.34 src/sys/arch/sgimips/gio/gio.c:1.35
--- src/sys/arch/sgimips/gio/gio.c:1.34 Wed Feb 18 16:47:58 2015
+++ src/sys/arch/sgimips/gio/gio.c Wed Jul 20 22:16:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: gio.c,v 1.34 2015/02/18 16:47:58 macallan Exp $ */
+/* $NetBSD: gio.c,v 1.35 2016/07/20 22:16:37 macallan Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.34 2015/02/18 16:47:58 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.35 2016/07/20 22:16:37 macallan Exp $");
#include "opt_ddb.h"
@@ -207,14 +207,17 @@ gio_attach(device_t parent, device_t sel
ga.ga_slot = -1;
ga.ga_addr = gfx_bases[i].base;
+ /* XXX */
+ if (platform.badaddr((void *)MIPS_PHYS_TO_KSEG1(ga.ga_addr),
+ sizeof(uint32_t)))
+ continue;
ga.ga_iot = normal_memt;
- /* XXX bus_space_map() */
- ga.ga_ioh = MIPS_PHYS_TO_KSEG1(ga.ga_addr);
+ if (bus_space_map(normal_memt, ga.ga_addr, 0,
+ BUS_SPACE_MAP_LINEAR, _ioh) != 0)
+ continue;
ga.ga_dmat = _default_bus_dma_tag;
ga.ga_product = -1;
- if (platform.badaddr((void *)ga.ga_ioh, sizeof(uint32_t)))
- continue;
if (config_found_sm_loc(self, "gio", NULL, , gio_print,
gio_submatch)) {
@@ -252,13 +255,16 @@ gio_attach(device_t parent, device_t sel
ga.ga_slot = slot_bases[i].slot;
ga.ga_addr = slot_bases[i].base;
+ /* XXX */
+ if (platform.badaddr((void *)MIPS_PHYS_TO_KSEG1(ga.ga_addr),
+ sizeof(uint32_t)))
+ continue;
ga.ga_iot = normal_memt;
- ga.ga_ioh = MIPS_PHYS_TO_KSEG1(ga.ga_addr);
+ if (bus_space_map(normal_memt, ga.ga_addr, 0,
+ BUS_SPACE_MAP_LINEAR, _ioh) != 0)
+ continue;
ga.ga_dmat = _default_bus_dma_tag;
- if (platform.badaddr((void *)ga.ga_ioh, sizeof(uint32_t)))
- continue;
-
ga.ga_product = bus_space_read_4(ga.ga_iot, ga.ga_ioh, 0);
config_found_sm_loc(self, "gio", NULL, , gio_print,
@@ -366,14 +372,17 @@ gio_cnattach(void)
ga.ga_slot = -1;
ga.ga_addr = gfx_bases[i].base;
+ /* XXX */
+ if (platform.badaddr((void *)MIPS_PHYS_TO_KSEG1(ga.ga_addr),
+ sizeof(uint32_t)))
+ continue;
ga.ga_iot = normal_memt;
- ga.ga_ioh = MIPS_PHYS_TO_KSEG1(ga.ga_addr);
+ if (bus_space_map(normal_memt, ga.ga_addr, 0,
+ BUS_SPACE_MAP_LINEAR, _ioh) != 0)
+ continue;
ga.ga_dmat = _default_bus_dma_tag;
ga.ga_product = -1;
- if (platform.badaddr((void *)ga.ga_ioh,sizeof(uint32_t)))
- continue;
-
#if (NGRTWO > 0)
if (grtwo_cnattach() == 0)
return 0;
CVS commit: src/sys/arch/sgimips/gio
Module Name:src
Committed By: macallan
Date: Tue Aug 25 02:09:18 UTC 2015
Modified Files:
src/sys/arch/sgimips/gio: newport.c
Log Message:
- pass the right address to bus_space_mmap() so this works on N32 kernels
- don't mess with XMAP9 when switching to graphics mode
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sgimips/gio/newport.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/sgimips/gio/newport.c
diff -u src/sys/arch/sgimips/gio/newport.c:1.18 src/sys/arch/sgimips/gio/newport.c:1.19
--- src/sys/arch/sgimips/gio/newport.c:1.18 Mon Jun 2 15:16:23 2014
+++ src/sys/arch/sgimips/gio/newport.c Tue Aug 25 02:09:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: newport.c,v 1.18 2014/06/02 15:16:23 macallan Exp $ */
+/* $NetBSD: newport.c,v 1.19 2015/08/25 02:09:18 macallan Exp $ */
/*
* Copyright (c) 2003 Ilpo Ruotsalainen
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.18 2014/06/02 15:16:23 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.19 2015/08/25 02:09:18 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -58,10 +58,9 @@ struct newport_softc {
};
struct newport_devconfig {
- uint32_t dc_addr;
-
bus_space_tag_t dc_st;
bus_space_handle_t dc_sh;
+ bus_addr_t dc_addr;
int dc_boardrev;
int dc_vc2rev;
@@ -909,12 +908,6 @@ newport_ioctl(void *v, void *vs, u_long
rex3_wait_gfifo(dc);
newport_setup_hw(dc);
vcons_redraw_screen(vd-active);
- } else {
-xmap9_write_mode(dc, 0,
- XMAP9_MODE_GAMMA_BYPASS |
-XMAP9_CONFIG_RGBMAP_2 |
- XMAP9_MODE_PIXSIZE_24BPP);
-xmap9_write(dc, XMAP9_DCBCRS_MODE_SELECT, 0);
}
}
return 0;
@@ -934,5 +927,5 @@ newport_mmap(void *v, void *vs, off_t of
if ( offset = 0xf)
return -1;
- return bus_space_mmap(dc-dc_st, dc-dc_sh, offset, prot, 0);
+ return bus_space_mmap(dc-dc_st, dc-dc_addr, offset, prot, 0);
}
CVS commit: src/sys/arch/sgimips/gio
Module Name:src
Committed By: macallan
Date: Mon Jun 2 15:16:23 UTC 2014
Modified Files:
src/sys/arch/sgimips/gio: newport.c
Log Message:
more __unused()
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sgimips/gio/newport.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/sgimips/gio/newport.c
diff -u src/sys/arch/sgimips/gio/newport.c:1.17 src/sys/arch/sgimips/gio/newport.c:1.18
--- src/sys/arch/sgimips/gio/newport.c:1.17 Wed Jan 11 21:23:38 2012
+++ src/sys/arch/sgimips/gio/newport.c Mon Jun 2 15:16:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: newport.c,v 1.17 2012/01/11 21:23:38 macallan Exp $ */
+/* $NetBSD: newport.c,v 1.18 2014/06/02 15:16:23 macallan Exp $ */
/*
* Copyright (c) 2003 Ilpo Ruotsalainen
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.17 2012/01/11 21:23:38 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.18 2014/06/02 15:16:23 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -433,7 +433,7 @@ newport_get_resolution(struct newport_de
static void
newport_setup_hw(struct newport_devconfig *dc)
{
- uint16_t curp,tmp;
+ uint16_t __unused(curp), tmp;
int i;
uint32_t scratch;
@@ -882,7 +882,7 @@ newport_ioctl(void *v, void *vs, u_long
{
struct vcons_data *vd;
struct newport_devconfig *dc;
- struct vcons_screen *ms;
+ struct vcons_screen *__unused(ms);
int nmode;
vd = (struct vcons_data *)v;
CVS commit: src/sys/arch/sgimips/gio
Module Name:src
Committed By: ozaki-r
Date: Wed Apr 2 00:46:12 UTC 2014
Modified Files:
src/sys/arch/sgimips/gio: pci_gio.c
Log Message:
Get rid of a wrong comma
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sgimips/gio/pci_gio.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/sgimips/gio/pci_gio.c
diff -u src/sys/arch/sgimips/gio/pci_gio.c:1.12 src/sys/arch/sgimips/gio/pci_gio.c:1.13
--- src/sys/arch/sgimips/gio/pci_gio.c:1.12 Sat Mar 29 19:28:30 2014
+++ src/sys/arch/sgimips/gio/pci_gio.c Wed Apr 2 00:46:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_gio.c,v 1.12 2014/03/29 19:28:30 christos Exp $ */
+/* $NetBSD: pci_gio.c,v 1.13 2014/04/02 00:46:11 ozaki-r Exp $ */
/*
* Copyright (c) 2006 Stephen M. Rumble
@@ -25,7 +25,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_gio.c,v 1.12 2014/03/29 19:28:30 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_gio.c,v 1.13 2014/04/02 00:46:11 ozaki-r Exp $);
/*
* Glue for PCI devices that are connected to the GIO bus by various little
@@ -302,7 +302,7 @@ giopci_intr_map(const struct pci_attach_
static const char *
giopci_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih, char * buf,
-size_t, len)
+size_t len)
{
snprintf(buf, len, slot %s, (ih == GIO_SLOT_EXP0) ? EXP0 :
(ih == GIO_SLOT_EXP1) ? EXP1 : GFX);
CVS commit: src/sys/arch/sgimips/gio
Module Name:src Committed By: christos Date: Fri Jan 10 16:36:30 UTC 2014 Modified Files: src/sys/arch/sgimips/gio: Makefile.giodevs Log Message: include bsd.own.mk To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sgimips/gio/Makefile.giodevs 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/sgimips/gio/Makefile.giodevs diff -u src/sys/arch/sgimips/gio/Makefile.giodevs:1.5 src/sys/arch/sgimips/gio/Makefile.giodevs:1.6 --- src/sys/arch/sgimips/gio/Makefile.giodevs:1.5 Sun Oct 19 18:05:21 2008 +++ src/sys/arch/sgimips/gio/Makefile.giodevs Fri Jan 10 11:36:29 2014 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.giodevs,v 1.5 2008/10/19 22:05:21 apb Exp $ +# $NetBSD: Makefile.giodevs,v 1.6 2014/01/10 16:36:29 christos Exp $ -.include bsd.sys.mk +.include bsd.own.mk giodevs.h: giodevs devlist2h.awk /bin/rm -f giodevs.h giodevs_data.h
CVS commit: src/sys/arch/sgimips/gio
Module Name:src Committed By: macallan Date: Wed Jan 11 21:23:07 UTC 2012 Modified Files: src/sys/arch/sgimips/gio: newportreg.h Log Message: add some register definitions To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sgimips/gio/newportreg.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/sgimips/gio/newportreg.h diff -u src/sys/arch/sgimips/gio/newportreg.h:1.5 src/sys/arch/sgimips/gio/newportreg.h:1.6 --- src/sys/arch/sgimips/gio/newportreg.h:1.5 Sun Feb 20 07:59:50 2011 +++ src/sys/arch/sgimips/gio/newportreg.h Wed Jan 11 21:23:07 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: newportreg.h,v 1.5 2011/02/20 07:59:50 matt Exp $ */ +/* $NetBSD: newportreg.h,v 1.6 2012/01/11 21:23:07 macallan Exp $ */ /* * Copyright (c) 2003 Ilpo Ruotsalainen @@ -194,6 +194,7 @@ #define REX3_REG_STATUS 0x1338 #define REX3_STATUS_GFXBUSY 0x0008 +#define REX3_STATUS_PIPELEVEL_MASK 0x1f80 /* VC2 */ @@ -261,6 +262,7 @@ #define XMAP9_DCBCRS_MODE_SETUP 5 #define XMAP9_MODE_GAMMA_BYPASS 0x04 #define XMAP9_MODE_PIXSIZE_8BPP 0x000400 +#define XMAP9_MODE_PIXSIZE_24BPP 0x000c00 #define XMAP9_DCBCRS_MODE_SELECT 7 /* DCB addresses */
CVS commit: src/sys/arch/sgimips/gio
Module Name:src Committed By: macallan Date: Wed Jan 11 21:23:38 UTC 2012 Modified Files: src/sys/arch/sgimips/gio: grtwo.c light.c newport.c Log Message: adjust for wsfont_find() change To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sgimips/gio/grtwo.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sgimips/gio/light.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sgimips/gio/newport.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/sgimips/gio/grtwo.c diff -u src/sys/arch/sgimips/gio/grtwo.c:1.11 src/sys/arch/sgimips/gio/grtwo.c:1.12 --- src/sys/arch/sgimips/gio/grtwo.c:1.11 Sun Nov 22 19:09:15 2009 +++ src/sys/arch/sgimips/gio/grtwo.c Wed Jan 11 21:23:38 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: grtwo.c,v 1.11 2009/11/22 19:09:15 mbalmer Exp $ */ +/* $NetBSD: grtwo.c,v 1.12 2012/01/11 21:23:38 macallan Exp $ */ /* * Copyright (c) 2004 Christopher SEKIYA @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: grtwo.c,v 1.11 2009/11/22 19:09:15 mbalmer Exp $); +__KERNEL_RCSID(0, $NetBSD: grtwo.c,v 1.12 2012/01/11 21:23:38 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -476,7 +476,7 @@ grtwo_attach_common(struct grtwo_devconf wsfont_init(); dc-dc_font = wsfont_find(NULL, 8, 16, 0, WSDISPLAY_FONTORDER_L2R, - WSDISPLAY_FONTORDER_L2R); + WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP); if (dc-dc_font 0) panic(grtwo_attach_common: no suitable fonts); Index: src/sys/arch/sgimips/gio/light.c diff -u src/sys/arch/sgimips/gio/light.c:1.5 src/sys/arch/sgimips/gio/light.c:1.6 --- src/sys/arch/sgimips/gio/light.c:1.5 Sun Mar 4 06:00:39 2007 +++ src/sys/arch/sgimips/gio/light.c Wed Jan 11 21:23:38 2012 @@ -1,4 +1,4 @@ -/* $Id: light.c,v 1.5 2007/03/04 06:00:39 christos Exp $ */ +/* $Id: light.c,v 1.6 2012/01/11 21:23:38 macallan Exp $ */ /* * Copyright (c) 2006 Stephen M. Rumble @@ -43,7 +43,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: light.c,v 1.5 2007/03/04 06:00:39 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: light.c,v 1.6 2012/01/11 21:23:38 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -297,7 +297,7 @@ light_attach_common(struct light_devconf wsfont_init(); dc-dc_font = wsfont_find(NULL, 8, 16, 0, WSDISPLAY_FONTORDER_L2R, - WSDISPLAY_FONTORDER_L2R); + WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP); if (dc-dc_font 0) panic(light_attach_common: no suitable fonts); Index: src/sys/arch/sgimips/gio/newport.c diff -u src/sys/arch/sgimips/gio/newport.c:1.16 src/sys/arch/sgimips/gio/newport.c:1.17 --- src/sys/arch/sgimips/gio/newport.c:1.16 Wed Jan 11 16:18:30 2012 +++ src/sys/arch/sgimips/gio/newport.c Wed Jan 11 21:23:38 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: newport.c,v 1.16 2012/01/11 16:18:30 macallan Exp $ */ +/* $NetBSD: newport.c,v 1.17 2012/01/11 21:23:38 macallan Exp $ */ /* * Copyright (c) 2003 Ilpo Ruotsalainen @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.16 2012/01/11 16:18:30 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.17 2012/01/11 21:23:38 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -536,7 +536,7 @@ newport_attach_common(struct newport_dev wsfont_init(); dc-dc_font = wsfont_find(NULL, 8, 16, 0, WSDISPLAY_FONTORDER_L2R, - WSDISPLAY_FONTORDER_L2R); + WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP); if (dc-dc_font 0) panic(newport_attach_common: no suitable fonts);
CVS commit: src/sys/arch/sgimips/gio
Module Name:src Committed By: macallan Date: Tue May 12 23:51:25 UTC 2009 Modified Files: src/sys/arch/sgimips/gio: newport.c Log Message: remove leftover debug code To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sgimips/gio/newport.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/sgimips/gio/newport.c diff -u src/sys/arch/sgimips/gio/newport.c:1.14 src/sys/arch/sgimips/gio/newport.c:1.15 --- src/sys/arch/sgimips/gio/newport.c:1.14 Wed Mar 4 01:23:28 2009 +++ src/sys/arch/sgimips/gio/newport.c Tue May 12 23:51:25 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: newport.c,v 1.14 2009/03/04 01:23:28 macallan Exp $ */ +/* $NetBSD: newport.c,v 1.15 2009/05/12 23:51:25 macallan Exp $ */ /* * Copyright (c) 2003 Ilpo Ruotsalainen @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.14 2009/03/04 01:23:28 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.15 2009/05/12 23:51:25 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -629,9 +629,7 @@ ri-ri_font = newport_console_dc.dc_fontdata; newport_console_screen.scr_cookie = newport_console_dc; - newport_putchar(ri, 3, 3, 0x41, defattr); wsdisplay_cnattach(newport_screen, ri, 0, 0, defattr); - newport_putchar(ri, 4, 3, 0x42, defattr); newport_is_console = 1;
