CVS commit: src/sys/dev/sun
Module Name:src Committed By: thorpej Date: Tue Feb 13 13:46:14 UTC 2024 Modified Files: src/sys/dev/sun: sireg.h Log Message: Add the Sun3 obio flavor's DMA controller access registers. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/sun/sireg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/sun
Module Name:src
Committed By: thorpej
Date: Tue Feb 13 13:46:14 UTC 2024
Modified Files:
src/sys/dev/sun: sireg.h
Log Message:
Add the Sun3 obio flavor's DMA controller access registers.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/sun/sireg.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/sun/sireg.h
diff -u src/sys/dev/sun/sireg.h:1.1 src/sys/dev/sun/sireg.h:1.2
--- src/sys/dev/sun/sireg.h:1.1 Tue Feb 13 05:35:13 2024
+++ src/sys/dev/sun/sireg.h Tue Feb 13 13:46:14 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sireg.h,v 1.1 2024/02/13 05:35:13 thorpej Exp $ */
+/* $NetBSD: sireg.h,v 1.2 2024/02/13 13:46:14 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -54,7 +54,9 @@ struct si_regs {
u_short dma_counth; /* DMA count (VME only) */
u_short dma_countl; /* (high word, low word) */
- u_int pad0; /* no-existent register */
+ /* AMD 9516 regs (OBIO only) see am9516.h */
+ u_short udc_data; /* Am9516, reg data (OBIO only) */
+ u_short udc_addr; /* Am9516, reg addr (OBIO only) */
u_short fifo_data; /* fifo data register */
u_short fifo_count; /* fifo count register */
@@ -83,6 +85,8 @@ struct si_regs {
#define SIREG_DMA_ADDRL (NCR5380REGS_SZ + 2) /* DMA address, low word */
#define SIREG_DMA_CNTH (NCR5380REGS_SZ + 4) /* DMA count, high word */
#define SIREG_DMA_CNTL (NCR5380REGS_SZ + 6) /* DMA count, low word */
+#define SIREG_UDC_DATA (NCR5380REGS_SZ + 8) /* UDC reg data */
+#define SIREG_UDC_ADDR (NCR5380REGS_SZ + 10) /* UDC reg addr */
#define SIREG_FIFO_DATA (NCR5380REGS_SZ + 12) /* FIFO data */
#define SIREG_FIFO_CNT (NCR5380REGS_SZ + 14) /* FIFO count, low word */
#define SIREG_CSR (NCR5380REGS_SZ + 16) /* Control/status register */
CVS commit: src/sys/dev/sun
Module Name:src
Committed By: riastradh
Date: Wed Oct 26 23:47:55 UTC 2022
Modified Files:
src/sys/dev/sun: sunkbd.c
Log Message:
sunkbd(4): Convert to ttylock/ttyunlock.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/sun/sunkbd.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/sun/sunkbd.c
diff -u src/sys/dev/sun/sunkbd.c:1.31 src/sys/dev/sun/sunkbd.c:1.32
--- src/sys/dev/sun/sunkbd.c:1.31 Sun Sep 25 21:30:29 2022
+++ src/sys/dev/sun/sunkbd.c Wed Oct 26 23:47:55 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sunkbd.c,v 1.31 2022/09/25 21:30:29 thorpej Exp $ */
+/* $NetBSD: sunkbd.c,v 1.32 2022/10/26 23:47:55 riastradh Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -51,7 +51,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunkbd.c,v 1.31 2022/09/25 21:30:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunkbd.c,v 1.32 2022/10/26 23:47:55 riastradh Exp $");
#include
#include
@@ -301,8 +301,8 @@ sunkbd_write_data(struct kbd_sun_softc *
{
struct tty *tp = k->k_priv;
- mutex_spin_enter(_lock);
+ ttylock(tp);
ttyoutput(c, tp);
ttstart(tp);
- mutex_spin_exit(_lock);
+ ttyunlock(tp);
}
CVS commit: src/sys/dev/sun
Module Name:src Committed By: riastradh Date: Wed Oct 26 23:47:55 UTC 2022 Modified Files: src/sys/dev/sun: sunkbd.c Log Message: sunkbd(4): Convert to ttylock/ttyunlock. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/dev/sun/sunkbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/sun
Module Name:src Committed By: thorpej Date: Sun Sep 25 21:30:29 UTC 2022 Modified Files: src/sys/dev/sun: bwtwo.c cgsix.c cgthree.c kbd_zs.c sunkbd.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/dev/sun/bwtwo.c cvs rdiff -u -r1.71 -r1.72 src/sys/dev/sun/cgsix.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/sun/cgthree.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/sun/kbd_zs.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/sun/sunkbd.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/sun/bwtwo.c diff -u src/sys/dev/sun/bwtwo.c:1.38 src/sys/dev/sun/bwtwo.c:1.39 --- src/sys/dev/sun/bwtwo.c:1.38 Sat Aug 7 16:19:16 2021 +++ src/sys/dev/sun/bwtwo.c Sun Sep 25 21:30:29 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: bwtwo.c,v 1.38 2021/08/07 16:19:16 thorpej Exp $ */ +/* $NetBSD: bwtwo.c,v 1.39 2022/09/25 21:30:29 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -79,13 +79,12 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.38 2021/08/07 16:19:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.39 2022/09/25 21:30:29 thorpej Exp $"); #include #include #include #include -#include #include #include #include Index: src/sys/dev/sun/cgsix.c diff -u src/sys/dev/sun/cgsix.c:1.71 src/sys/dev/sun/cgsix.c:1.72 --- src/sys/dev/sun/cgsix.c:1.71 Thu Apr 28 03:12:03 2022 +++ src/sys/dev/sun/cgsix.c Sun Sep 25 21:30:29 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: cgsix.c,v 1.71 2022/04/28 03:12:03 macallan Exp $ */ +/* $NetBSD: cgsix.c,v 1.72 2022/09/25 21:30:29 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -78,14 +78,13 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.71 2022/04/28 03:12:03 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.72 2022/09/25 21:30:29 thorpej Exp $"); #include #include #include #include #include -#include #include #include #include Index: src/sys/dev/sun/cgthree.c diff -u src/sys/dev/sun/cgthree.c:1.35 src/sys/dev/sun/cgthree.c:1.36 --- src/sys/dev/sun/cgthree.c:1.35 Sat Aug 7 16:19:16 2021 +++ src/sys/dev/sun/cgthree.c Sun Sep 25 21:30:29 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: cgthree.c,v 1.35 2021/08/07 16:19:16 thorpej Exp $ */ +/* $NetBSD: cgthree.c,v 1.36 2022/09/25 21:30:29 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,14 +38,13 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.35 2021/08/07 16:19:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.36 2022/09/25 21:30:29 thorpej Exp $"); #include #include #include #include #include -#include #include #include #include Index: src/sys/dev/sun/kbd_zs.c diff -u src/sys/dev/sun/kbd_zs.c:1.23 src/sys/dev/sun/kbd_zs.c:1.24 --- src/sys/dev/sun/kbd_zs.c:1.23 Sun Apr 20 15:44:01 2008 +++ src/sys/dev/sun/kbd_zs.c Sun Sep 25 21:30:29 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: kbd_zs.c,v 1.23 2008/04/20 15:44:01 tsutsui Exp $ */ +/* $NetBSD: kbd_zs.c,v 1.24 2022/09/25 21:30:29 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -53,14 +53,13 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kbd_zs.c,v 1.23 2008/04/20 15:44:01 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbd_zs.c,v 1.24 2022/09/25 21:30:29 thorpej Exp $"); #include #include #include #include #include -#include #include #include #include Index: src/sys/dev/sun/sunkbd.c diff -u src/sys/dev/sun/sunkbd.c:1.30 src/sys/dev/sun/sunkbd.c:1.31 --- src/sys/dev/sun/sunkbd.c:1.30 Tue Oct 31 10:46:47 2017 +++ src/sys/dev/sun/sunkbd.c Sun Sep 25 21:30:29 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: sunkbd.c,v 1.30 2017/10/31 10:46:47 martin Exp $ */ +/* $NetBSD: sunkbd.c,v 1.31 2022/09/25 21:30:29 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -51,14 +51,13 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sunkbd.c,v 1.30 2017/10/31 10:46:47 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunkbd.c,v 1.31 2022/09/25 21:30:29 thorpej Exp $"); #include #include #include #include #include -#include #include #include #include
CVS commit: src/sys/dev/sun
Module Name:src Committed By: thorpej Date: Sun Sep 25 21:30:29 UTC 2022 Modified Files: src/sys/dev/sun: bwtwo.c cgsix.c cgthree.c kbd_zs.c sunkbd.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/dev/sun/bwtwo.c cvs rdiff -u -r1.71 -r1.72 src/sys/dev/sun/cgsix.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/sun/cgthree.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/sun/kbd_zs.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/sun/sunkbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/sun
Module Name:src
Committed By: macallan
Date: Thu Apr 28 03:12:03 UTC 2022
Modified Files:
src/sys/dev/sun: cgsix.c
Log Message:
be lazy about clearing the cursor - in most cases we're about to overwrite it
anyway. Same logic as with VCONS_DONT_READ.
visible speedup in things like systat and top
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/sun/cgsix.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/sun/cgsix.c
diff -u src/sys/dev/sun/cgsix.c:1.70 src/sys/dev/sun/cgsix.c:1.71
--- src/sys/dev/sun/cgsix.c:1.70 Sat Aug 7 16:19:16 2021
+++ src/sys/dev/sun/cgsix.c Thu Apr 28 03:12:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.70 2021/08/07 16:19:16 thorpej Exp $ */
+/* $NetBSD: cgsix.c,v 1.71 2022/04/28 03:12:03 macallan Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.70 2021/08/07 16:19:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.71 2022/04/28 03:12:03 macallan Exp $");
#include
#include
@@ -339,6 +339,23 @@ cg6_ras_init(struct cgsix_softc *sc)
}
static void
+cg6_ras_nuke_cursor(struct rasops_info *ri)
+{
+ struct vcons_screen *scr = ri->ri_hw;
+ struct cgsix_softc *sc = scr->scr_cookie;
+ int wi, he, x, y;
+
+ if (ri->ri_flg & RI_CURSOR) {
+ wi = ri->ri_font->fontwidth;
+ he = ri->ri_font->fontheight;
+ x = ri->ri_ccol * wi + ri->ri_xorigin;
+ y = ri->ri_crow * he + ri->ri_yorigin;
+ cg6_invert(sc, x, y, wi, he);
+ ri->ri_flg &= ~RI_CURSOR;
+ }
+}
+
+static void
cg6_ras_copyrows(void *cookie, int src, int dst, int n)
{
struct rasops_info *ri = cookie;
@@ -362,6 +379,10 @@ cg6_ras_copyrows(void *cookie, int src,
n = ri->ri_rows - dst;
if (n <= 0)
return;
+ if ((ri->ri_crow >= src && ri->ri_crow < (src + n)) &&
+ (ri->ri_flg & RI_CURSOR)) {
+ cg6_ras_nuke_cursor(ri);
+ }
n *= ri->ri_font->fontheight;
src *= ri->ri_font->fontheight;
dst *= ri->ri_font->fontheight;
@@ -380,6 +401,8 @@ cg6_ras_copyrows(void *cookie, int src,
fbc->fbc_x3 = ri->ri_xorigin + ri->ri_emuwidth - 1;
fbc->fbc_y3 = ri->ri_yorigin + dst + n - 1;
CG6_BLIT(fbc);
+ if (ri->ri_crow >= dst && ri->ri_crow < (dst + n))
+ ri->ri_flg &= ~RI_CURSOR;
}
static void
@@ -408,6 +431,11 @@ cg6_ras_copycols(void *cookie, int row,
n = ri->ri_cols - dst;
if (n <= 0)
return;
+ if (ri->ri_crow == row &&
+ (ri->ri_ccol >= src && ri->ri_ccol < (src + n)) &&
+ (ri->ri_flg & RI_CURSOR)) {
+ cg6_ras_nuke_cursor(ri);
+ }
n *= ri->ri_font->fontwidth;
src *= ri->ri_font->fontwidth;
dst *= ri->ri_font->fontwidth;
@@ -429,6 +457,9 @@ cg6_ras_copycols(void *cookie, int row,
fbc->fbc_y3 = ri->ri_yorigin + row +
ri->ri_font->fontheight - 1;
CG6_BLIT(fbc);
+ if (ri->ri_crow == row &&
+ (ri->ri_ccol >= dst && ri->ri_ccol < (dst + n)))
+ ri->ri_flg &= ~RI_CURSOR;
}
static void
@@ -449,6 +480,11 @@ cg6_ras_erasecols(void *cookie, int row,
n = ri->ri_cols - col;
if (n <= 0)
return;
+
+ if (ri->ri_crow == row &&
+ (ri->ri_ccol >= col && ri->ri_ccol < (col + n)))
+ ri->ri_flg &= ~RI_CURSOR;
+
n *= ri->ri_font->fontwidth;
col *= ri->ri_font->fontwidth;
row *= ri->ri_font->fontheight;
@@ -483,6 +519,9 @@ cg6_ras_eraserows(void *cookie, int row,
if (n <= 0)
return;
+ if (ri->ri_crow >= row && ri->ri_crow < (row + n))
+ ri->ri_flg &= ~RI_CURSOR;
+
CG6_WAIT_READY(fbc);
fbc->fbc_alu = CG6_ALU_FILL;
fbc->fbc_mode = GX_BLIT_SRC | GX_MODE_COLOR8;
@@ -624,7 +663,7 @@ cg6attach(struct cgsix_softc *sc, const
}
}
cg6_setup_palette(sc);
-
+
aa.scrdata = _screenlist;
aa.console = isconsole;
aa.accessops = _accessops;
@@ -1369,6 +1408,10 @@ cgsix_putchar(void *cookie, int row, int
if ((row >= 0) && (row < ri->ri_rows) && (col >= 0) &&
(col < ri->ri_cols)) {
+ if (row == ri->ri_crow && col == ri->ri_ccol) {
+ ri->ri_flg &= ~RI_CURSOR;
+ }
+
if (sc->sc_mode == WSDISPLAYIO_MODE_EMUL) {
int fg, bg, uc, i;
@@ -1438,6 +1481,10 @@ cgsix_putchar_aa(void *cookie, int row,
if (!CHAR_IN_FONT(c, font))
return;
+ if (row == ri->ri_crow && col == ri->ri_ccol) {
+ ri->ri_flg &= ~RI_CURSOR;
+ }
+
wi = font->fontwidth;
he = font->fontheight;
@@ -1532,21 +1579,17 @@ cgsix_cursor(void *cookie, int on, int r
he = ri->ri_font->fontheight;
if (sc->sc_mode == WSDISPLAYIO_MODE_EMUL) {
- x = ri->ri_ccol * wi + ri->ri_xorigin;
- y = ri->ri_crow * he + ri->ri_yorigin;
- if (ri->ri_flg & RI_CURSOR) {
+ if (on) {
+ if (ri->ri_flg & RI_CURSOR) {
+cg6_ras_nuke_cursor(ri);
+ }
+ x = col * wi + ri->ri_xorigin;
+ y = row * he + ri->ri_yorigin;
cg6_invert(sc, x, y, wi, he);
- ri->ri_flg &= ~RI_CURSOR;
+ ri->ri_flg |= RI_CURSOR;
}
ri->ri_crow = row;
ri->ri_ccol = col;
- if (on)
- {
- x = ri->ri_ccol * wi + ri->ri_xorigin;
- y =
CVS commit: src/sys/dev/sun
Module Name:src Committed By: macallan Date: Thu Apr 28 03:12:03 UTC 2022 Modified Files: src/sys/dev/sun: cgsix.c Log Message: be lazy about clearing the cursor - in most cases we're about to overwrite it anyway. Same logic as with VCONS_DONT_READ. visible speedup in things like systat and top To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/dev/sun/cgsix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/sun
On Fri, Feb 09, 2018 at 12:30:00AM +, m...@netbsd.org wrote: > The alternative version sounds more desirable (keyboard power button > works even if not console), what do you think? The typical/default setup on suns is: if keyboard is attached at reset/power up time, it will become console. If you explicitly set firmware to use serial console even though the keyboard is installed, I'd think you don't want the power button on the keyboard to shut your machine down either. This might be worth a sysctl or compile time option, but is a pretty rare corner case, so I'd leave it as it is now. Martin
Re: CVS commit: src/sys/dev/sun
> case 0x30:
> #if NSYSMON_ENVSYS
> - if (k->k_isconsole)
> + if (k->k_isconsole) {
> k->k_ev = KEY_UP(code) ?
> PSWITCH_EVENT_RELEASED :
> PSWITCH_EVENT_PRESSED;
> sysmon_task_queue_sched(0,
> kbd_powerbutton, k);
> + }
The alternative version sounds more desirable (keyboard power button
works even if not console), what do you think?
re: CVS commit: src/sys/dev/sun
On Sep 29, 3:07pm, m...@eterna.com.au (matthew green) wrote: -- Subject: re: CVS commit: src/sys/dev/sun | "Christos Zoulas" writes: | > Module Name:src | > Committed By: christos | > Date: Sat Sep 26 03:31:53 UTC 2015 | > | > Modified Files: | > src/sys/dev/sun: disklabel.h | > | > Log Message: | > avoid conflicts with our own ioctls | | i can't find it off hand, but i used to have software that used | on netbsd and expected it to be the | sunos version of ioctls. | | i wonder if we can continue to provide those symbols to userland? We can provide an ifdef for it, but these are only used for compat/sunos... I doubt that it ever worked to compile a sunos binary on NetBSD. After all the NetBSD native emulation does not know what to do with those ioctls, so compiling a NetBSD binary with those ioctls won't run. christos
re: CVS commit: src/sys/dev/sun
> | > Committed By: christos > | > Date: Sat Sep 26 03:31:53 UTC 2015 > | > > | > Modified Files: > | > src/sys/dev/sun: disklabel.h > | > > | > Log Message: > | > avoid conflicts with our own ioctls > | > | i can't find it off hand, but i used to have software that used > | on netbsd and expected it to be the > | sunos version of ioctls. > | > | i wonder if we can continue to provide those symbols to userland? > > We can provide an ifdef for it, but these are only used for compat/sunos... > I doubt that it ever worked to compile a sunos binary on NetBSD. After > all the NetBSD native emulation does not know what to do with those ioctls, > so compiling a NetBSD binary with those ioctls won't run. you misunderstand me. there was *userland* software that uses netbsd's to find the sun disklabel stuff. but maybe it doesn't matter cuz i can't seem to find it anymore. .mrg.
re: CVS commit: src/sys/dev/sun
"Christos Zoulas" writes: > Module Name: src > Committed By: christos > Date: Sat Sep 26 03:31:53 UTC 2015 > > Modified Files: > src/sys/dev/sun: disklabel.h > > Log Message: > avoid conflicts with our own ioctls i can't find it off hand, but i used to have software that used on netbsd and expected it to be the sunos version of ioctls. i wonder if we can continue to provide those symbols to userland? .mrg.
Re: CVS commit: src/sys/dev/sun
Hello, on Thursday 12 September 2013 08:42:19 Martin Husemann wrote: Module Name: src Committed By: martin Date: Thu Sep 12 12:42:18 UTC 2013 Modified Files: src/sys/dev/sun: cgsix.c Log Message: Simplify CG6_DRAW() and CG6_BLIT() macros so gcc 4.8.1 does not warn about them - assembler looks good, but Michael, can you please test nevertheless? The patient is alive and well ;) have fun Michael
CVS commit: src/sys/dev/sun
Module Name:src Committed By: macallan Date: Thu Jan 14 02:18:59 UTC 2010 Modified Files: src/sys/dev/sun: wskbdmap_sun.c Log Message: actually assign audio control command codes to the audio control keys To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/dev/sun/wskbdmap_sun.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
