Module Name: src
Committed By: riastradh
Date: Wed Nov 27 14:09:10 UTC 2024
Modified Files:
src/sys/arch/hppa/dev: summitfb.c
src/sys/dev/ic: summitreg.h
Log Message:
hppa/summitfb(4): Nix trailing whitespace.
Plus some other minor whitespace/comment cleanups.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hppa/dev/summitfb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/summitreg.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/hppa/dev/summitfb.c
diff -u src/sys/arch/hppa/dev/summitfb.c:1.8 src/sys/arch/hppa/dev/summitfb.c:1.9
--- src/sys/arch/hppa/dev/summitfb.c:1.8 Wed Nov 27 11:11:21 2024
+++ src/sys/arch/hppa/dev/summitfb.c Wed Nov 27 14:09:10 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: summitfb.c,v 1.8 2024/11/27 11:11:21 macallan Exp $ */
+/* $NetBSD: summitfb.c,v 1.9 2024/11/27 14:09:10 riastradh Exp $ */
/* $OpenBSD: sti_pci.c,v 1.7 2009/02/06 22:51:04 miod Exp $ */
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: summitfb.c,v 1.8 2024/11/27 11:11:21 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: summitfb.c,v 1.9 2024/11/27 14:09:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -667,7 +667,7 @@ summitfb_setup(struct summitfb_softc *sc
summitfb_write4(sc, 0xa0081c, 0); /* fx4 */
#endif
- summitfb_wait(sc);
+ summitfb_wait(sc);
summitfb_write4(sc, VISFX_PIXEL_MASK, 0xffffffff);
summitfb_write4(sc, VISFX_PLANE_MASK, 0xffffffff);
summitfb_write_mode(sc, VISFX_WRITE_MODE_PLAIN);
@@ -1093,14 +1093,16 @@ summitfb_putchar(void *cookie, int row,
uint8_t *data8 = data;
for (i = 0; i < he; i++) {
mask = *data8;
- summitfb_write4(sc, VISFX_VRAM_WRITE_DATA_INCRY, mask << 24);
+ summitfb_write4(sc, VISFX_VRAM_WRITE_DATA_INCRY,
+ mask << 24);
data8++;
}
} else {
uint16_t *data16 = data;
for (i = 0; i < he; i++) {
mask = *data16;
- summitfb_write4(sc, VISFX_VRAM_WRITE_DATA_INCRY, mask << 16);
+ summitfb_write4(sc, VISFX_VRAM_WRITE_DATA_INCRY,
+ mask << 16);
data16++;
}
}
Index: src/sys/dev/ic/summitreg.h
diff -u src/sys/dev/ic/summitreg.h:1.4 src/sys/dev/ic/summitreg.h:1.5
--- src/sys/dev/ic/summitreg.h:1.4 Wed Nov 27 10:44:39 2024
+++ src/sys/dev/ic/summitreg.h Wed Nov 27 14:09:10 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: summitreg.h,v 1.4 2024/11/27 10:44:39 macallan Exp $ */
+/* $NetBSD: summitreg.h,v 1.5 2024/11/27 14:09:10 riastradh Exp $ */
/*
* Copyright (c) 2024 Michael Lorenz
@@ -39,7 +39,7 @@
#define SUMMITREG_H
#define VISFX_STATUS 0x641400 // zero when idle
-#define VISFX_FIFO 0x641440
+#define VISFX_FIFO 0x641440
#define VISFX_VRAM_WRITE_MODE 0xa00808
#define VISFX_VRAM_READ_MODE 0xa0080c // this is a guess
#define VISFX_PIXEL_MASK 0xa0082c
@@ -83,4 +83,4 @@
#define VISFX_CURSOR_COLOR 0x400010
#define VISFX_CURSOR_ENABLE 0x80000000
-#endif
\ No newline at end of file
+#endif /* SUMMITREG_H */
