CVS commit: src/sys/dev/tc
Module Name:src
Committed By: tsutsui
Date: Sat Feb 17 06:35:25 UTC 2024
Modified Files:
src/sys/dev/tc: zskbd.c
Log Message:
Fix another fatal typo that causes zskbd_cngetc() to stall as dzkbd.
Tested on my DEC 3000/300 and LK421.
Should be pulled up to netbsd-10 and netbsd-9.
XXX: sys/arch/vax/uba/qvkbd.c seems missed in the following lk201 changes:
https://mail-index.netbsd.org/source-changes/2015/01/02/msg062024.html
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/tc/zskbd.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/tc/zskbd.c
diff -u src/sys/dev/tc/zskbd.c:1.21 src/sys/dev/tc/zskbd.c:1.22
--- src/sys/dev/tc/zskbd.c:1.21 Sat Aug 7 16:19:16 2021
+++ src/sys/dev/tc/zskbd.c Sat Feb 17 06:35:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: zskbd.c,v 1.21 2021/08/07 16:19:16 thorpej Exp $ */
+/* $NetBSD: zskbd.c,v 1.22 2024/02/17 06:35:25 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.21 2021/08/07 16:19:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.22 2024/02/17 06:35:25 tsutsui Exp $");
#include
#include
@@ -281,7 +281,7 @@ zskbd_cngetc(void *v, u_int *type, int *
do {
c = zs_getc(zsi->zsi_cs);
- } while (!lk201_decode(>zsi_ks, 0, c, type, data) == LKD_NODATA);
+ } while (lk201_decode(>zsi_ks, 0, c, type, data) == LKD_NODATA);
}
static void
CVS commit: src/sys/dev/tc
Module Name:src Committed By: tsutsui Date: Sat Feb 17 06:35:25 UTC 2024 Modified Files: src/sys/dev/tc: zskbd.c Log Message: Fix another fatal typo that causes zskbd_cngetc() to stall as dzkbd. Tested on my DEC 3000/300 and LK421. Should be pulled up to netbsd-10 and netbsd-9. XXX: sys/arch/vax/uba/qvkbd.c seems missed in the following lk201 changes: https://mail-index.netbsd.org/source-changes/2015/01/02/msg062024.html To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/dev/tc/zskbd.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/tc
Module Name:src Committed By: thorpej Date: Sun Sep 25 21:28:51 UTC 2022 Modified Files: src/sys/dev/tc: tcds.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/tc/tcds.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/tc/tcds.c diff -u src/sys/dev/tc/tcds.c:1.28 src/sys/dev/tc/tcds.c:1.29 --- src/sys/dev/tc/tcds.c:1.28 Sat Aug 7 16:19:16 2021 +++ src/sys/dev/tc/tcds.c Sun Sep 25 21:28:51 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: tcds.c,v 1.28 2021/08/07 16:19:16 thorpej Exp $ */ +/* $NetBSD: tcds.c,v 1.29 2022/09/25 21:28:51 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -58,13 +58,12 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.28 2021/08/07 16:19:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.29 2022/09/25 21:28:51 thorpej Exp $"); #include #include #include #include -#include #ifdef __alpha__ #include
CVS commit: src/sys/dev/tc
Module Name:src Committed By: thorpej Date: Sun Sep 25 21:28:51 UTC 2022 Modified Files: src/sys/dev/tc: tcds.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/tc/tcds.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/tc
Module Name:src Committed By: thorpej Date: Wed Jul 20 14:19:39 UTC 2022 Modified Files: src/sys/dev/tc: zs_ioasic.c Log Message: No need to test for __alpha__ || alpha ... just one will suffice. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/dev/tc/zs_ioasic.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/tc
Module Name:src
Committed By: thorpej
Date: Wed Jul 20 14:19:39 UTC 2022
Modified Files:
src/sys/dev/tc: zs_ioasic.c
Log Message:
No need to test for __alpha__ || alpha ... just one will suffice.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/tc/zs_ioasic.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/tc/zs_ioasic.c
diff -u src/sys/dev/tc/zs_ioasic.c:1.45 src/sys/dev/tc/zs_ioasic.c:1.46
--- src/sys/dev/tc/zs_ioasic.c:1.45 Sat May 28 10:36:23 2022
+++ src/sys/dev/tc/zs_ioasic.c Wed Jul 20 14:19:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_ioasic.c,v 1.45 2022/05/28 10:36:23 andvar Exp $ */
+/* $NetBSD: zs_ioasic.c,v 1.46 2022/07/20 14:19:38 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.45 2022/05/28 10:36:23 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.46 2022/07/20 14:19:38 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,
#include
-#if defined(__alpha__) || defined(alpha)
+#if defined(__alpha__)
#include
#endif
#if defined(pmax)
@@ -113,7 +113,7 @@ int zs_def_cflag = (TTYDEF_CFLAG & ~(CSI
/* The layout of this is hardware-dependent (padding, order). */
struct zshan {
-#if defined(__alpha__) || defined(alpha)
+#if defined(__alpha__)
volatile u_int zc_csr; /* ctrl,status, and indirect access */
u_int zc_pad0;
volatile u_int zc_data; /* data */
@@ -158,7 +158,7 @@ zs_ioasic_get_chan_addr(tc_addr_t zsaddr
struct zsdevice *addr;
struct zshan *zc;
-#if defined(__alpha__) || defined(alpha)
+#if defined(__alpha__)
addr = (struct zsdevice *)TC_DENSE_TO_SPARSE(zsaddr);
#endif
#if defined(pmax)
@@ -343,7 +343,7 @@ zs_ioasic_attach(device_t parent, device
/* master interrupt control (enable) */
zs_write_reg(zs->zsc_cs[0], 9, zs_ioasic_init_reg[9]);
zs_write_reg(zs->zsc_cs[1], 9, zs_ioasic_init_reg[9]);
-#if defined(__alpha__) || defined(alpha)
+#if defined(__alpha__)
/* ioasic interrupt enable */
*(volatile u_int *)(ioasic_base + IOASIC_IMSK) |=
IOASIC_INTR_SCC_1 | IOASIC_INTR_SCC_0;
@@ -394,7 +394,7 @@ zs_ioasic_submatch(device_t parent, cfda
else if (systype == DS_MAXINE)
return (0);
#endif
-#if defined(__alpha__) || defined(alpha)
+#if defined(__alpha__)
else if (cputype == ST_DEC_3000_300)
return (0);
#endif
@@ -719,7 +719,7 @@ zs_ioasic_cninit(tc_addr_t ioasic_addr,
* Compute the physical address of the chip, "map" it via
* K0SEG, and then get the address of the actual channel.
*/
-#if defined(__alpha__) || defined(alpha)
+#if defined(__alpha__)
zs_addr = ALPHA_PHYS_TO_K0SEG(ioasic_addr + zs_offset);
#endif
#if defined(pmax)
CVS commit: src/sys/dev/tc
Module Name:src Committed By: abs Date: Mon Dec 6 17:43:50 UTC 2021 Modified Files: src/sys/dev/tc: sfbplus.c Log Message: Add WSDISPLAYIO_GET_FBINFO support to sfbplus TURBOchannel framebuffer Missed in previous change to cfb, mfb, sfb, tfb and xcfb To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/dev/tc/sfbplus.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/tc
Module Name:src
Committed By: abs
Date: Mon Dec 6 17:43:50 UTC 2021
Modified Files:
src/sys/dev/tc: sfbplus.c
Log Message:
Add WSDISPLAYIO_GET_FBINFO support to sfbplus TURBOchannel framebuffer
Missed in previous change to cfb, mfb, sfb, tfb and xcfb
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/tc/sfbplus.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/tc/sfbplus.c
diff -u src/sys/dev/tc/sfbplus.c:1.41 src/sys/dev/tc/sfbplus.c:1.42
--- src/sys/dev/tc/sfbplus.c:1.41 Sat Aug 7 16:19:16 2021
+++ src/sys/dev/tc/sfbplus.c Mon Dec 6 17:43:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sfbplus.c,v 1.41 2021/08/07 16:19:16 thorpej Exp $ */
+/* $NetBSD: sfbplus.c,v 1.42 2021/12/06 17:43:50 abs Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.41 2021/08/07 16:19:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.42 2021/12/06 17:43:50 abs Exp $");
#include
#include
@@ -431,6 +431,11 @@ sfbioctl(void *v, void *vs, u_long cmd,
*(u_int *)data = WSDISPLAY_TYPE_SFBP;
return (0);
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = data;
+ return wsdisplayio_get_fbinfo(sc->sc_ri, fbi);
+ }
+
case WSDISPLAYIO_GINFO:
#define wsd_fbip ((struct wsdisplay_fbinfo *)data)
wsd_fbip->height = ri->ri_height;
CVS commit: src/sys/dev/tc
Module Name:src
Committed By: abs
Date: Mon Dec 6 16:00:07 UTC 2021
Modified Files:
src/sys/dev/tc: cfb.c mfb.c sfb.c tfb.c xcfb.c
Log Message:
Add WSDISPLAYIO_GET_FBINFO support to most TURBOchannel framebuffers
This adds WSDISPLAYIO_GET_FBINFO to cfb, mfb, sfb, tfb and xcfb
TURBOchannel framebuffers as used by pmax and alpha
It does not add support to px and pxg (they handle ioctls in common
code in stic.c and more careful wiring is required)
These changes allow an Xswfb X server to use the framebuffer
directly, albeit without any special acceleration
A subsequent change will re-enable X server building on pmax, and
also hopefully switch alpha from Xorg 1.10 to 1.20
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/tc/cfb.c src/sys/dev/tc/tfb.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/tc/mfb.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/tc/sfb.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/tc/xcfb.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/tc/cfb.c
diff -u src/sys/dev/tc/cfb.c:1.65 src/sys/dev/tc/cfb.c:1.66
--- src/sys/dev/tc/cfb.c:1.65 Sat Aug 7 16:19:16 2021
+++ src/sys/dev/tc/cfb.c Mon Dec 6 16:00:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.65 2021/08/07 16:19:16 thorpej Exp $ */
+/* $NetBSD: cfb.c,v 1.66 2021/12/06 16:00:07 abs Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.65 2021/08/07 16:19:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.66 2021/12/06 16:00:07 abs Exp $");
#include
#include
@@ -363,6 +363,11 @@ cfbioctl(void *v, void *vs, u_long cmd,
*(u_int *)data = WSDISPLAY_TYPE_CFB;
return (0);
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = data;
+ return wsdisplayio_get_fbinfo(sc->sc_ri, fbi);
+ }
+
case WSDISPLAYIO_GINFO:
#define wsd_fbip ((struct wsdisplay_fbinfo *)data)
wsd_fbip->height = ri->ri_height;
Index: src/sys/dev/tc/tfb.c
diff -u src/sys/dev/tc/tfb.c:1.65 src/sys/dev/tc/tfb.c:1.66
--- src/sys/dev/tc/tfb.c:1.65 Sat Aug 7 16:19:16 2021
+++ src/sys/dev/tc/tfb.c Mon Dec 6 16:00:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tfb.c,v 1.65 2021/08/07 16:19:16 thorpej Exp $ */
+/* $NetBSD: tfb.c,v 1.66 2021/12/06 16:00:07 abs Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.65 2021/08/07 16:19:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.66 2021/12/06 16:00:07 abs Exp $");
#include
#include
@@ -397,6 +397,11 @@ tfbioctl(void *v, void *vs, u_long cmd,
*(u_int *)data = WSDISPLAY_TYPE_TX;
return (0);
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = data;
+ return wsdisplayio_get_fbinfo(sc->sc_ri, fbi);
+ }
+
case WSDISPLAYIO_GINFO:
#define wsd_fbip ((struct wsdisplay_fbinfo *)data)
wsd_fbip->height = ri->ri_height;
Index: src/sys/dev/tc/mfb.c
diff -u src/sys/dev/tc/mfb.c:1.63 src/sys/dev/tc/mfb.c:1.64
--- src/sys/dev/tc/mfb.c:1.63 Sat Aug 7 16:19:16 2021
+++ src/sys/dev/tc/mfb.c Mon Dec 6 16:00:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.63 2021/08/07 16:19:16 thorpej Exp $ */
+/* $NetBSD: mfb.c,v 1.64 2021/12/06 16:00:07 abs Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.63 2021/08/07 16:19:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.64 2021/12/06 16:00:07 abs Exp $");
#include
#include
@@ -327,6 +327,11 @@ mfbioctl(void *v, void *vs, u_long cmd,
*(u_int *)data = WSDISPLAY_TYPE_MFB;
return (0);
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = data;
+ return wsdisplayio_get_fbinfo(sc->sc_ri, fbi);
+ }
+
case WSDISPLAYIO_GINFO:
#define wsd_fbip ((struct wsdisplay_fbinfo *)data)
wsd_fbip->height = ri->ri_height;
Index: src/sys/dev/tc/sfb.c
diff -u src/sys/dev/tc/sfb.c:1.88 src/sys/dev/tc/sfb.c:1.89
--- src/sys/dev/tc/sfb.c:1.88 Sat Aug 7 16:19:16 2021
+++ src/sys/dev/tc/sfb.c Mon Dec 6 16:00:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sfb.c,v 1.88 2021/08/07 16:19:16 thorpej Exp $ */
+/* $NetBSD: sfb.c,v 1.89 2021/12/06 16:00:07 abs Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.88 2021/08/07 16:19:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.89 2021/12/06 16:00:07 abs Exp $");
#include
#include
@@ -397,6 +397,11 @@ sfbioctl(void *v, void *vs, u_long cmd,
*(u_int *)data = WSDISPLAY_TYPE_SFB;
return (0);
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = data;
+ return wsdisplayio_get_fbinfo(sc->sc_ri, fbi);
+ }
+
case WSDISPLAYIO_GINFO:
#define wsd_fbip ((struct wsdisplay_fbinfo *)data)
wsd_fbip->height = ri->ri_height;
Index:
CVS commit: src/sys/dev/tc
Module Name:src Committed By: abs Date: Mon Dec 6 16:00:07 UTC 2021 Modified Files: src/sys/dev/tc: cfb.c mfb.c sfb.c tfb.c xcfb.c Log Message: Add WSDISPLAYIO_GET_FBINFO support to most TURBOchannel framebuffers This adds WSDISPLAYIO_GET_FBINFO to cfb, mfb, sfb, tfb and xcfb TURBOchannel framebuffers as used by pmax and alpha It does not add support to px and pxg (they handle ioctls in common code in stic.c and more careful wiring is required) These changes allow an Xswfb X server to use the framebuffer directly, albeit without any special acceleration A subsequent change will re-enable X server building on pmax, and also hopefully switch alpha from Xorg 1.10 to 1.20 To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/dev/tc/cfb.c src/sys/dev/tc/tfb.c cvs rdiff -u -r1.63 -r1.64 src/sys/dev/tc/mfb.c cvs rdiff -u -r1.88 -r1.89 src/sys/dev/tc/sfb.c cvs rdiff -u -r1.59 -r1.60 src/sys/dev/tc/xcfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
