CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: skrll Date: Thu Sep 29 06:47:06 UTC 2022 Modified Files: src/sys/arch/cats/cats: autoconf.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/cats/cats/autoconf.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/cats/cats/autoconf.c diff -u src/sys/arch/cats/cats/autoconf.c:1.20 src/sys/arch/cats/cats/autoconf.c:1.21 --- src/sys/arch/cats/cats/autoconf.c:1.20 Thu Sep 29 06:46:17 2022 +++ src/sys/arch/cats/cats/autoconf.c Thu Sep 29 06:47:06 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.20 2022/09/29 06:46:17 skrll Exp $ */ +/* $NetBSD: autoconf.c,v 1.21 2022/09/29 06:47:06 skrll Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2022/09/29 06:46:17 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.21 2022/09/29 06:47:06 skrll Exp $"); #include "opt_md.h" @@ -52,7 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v #include #include #include -#include #include #include #include
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: skrll Date: Thu Sep 29 06:47:06 UTC 2022 Modified Files: src/sys/arch/cats/cats: autoconf.c Log Message: Remove unnecessary include of . To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/cats/cats/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/cats/cats
Module Name:src
Committed By: skrll
Date: Thu Sep 29 06:46:17 UTC 2022
Modified Files:
src/sys/arch/cats/cats: autoconf.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cats/cats/autoconf.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/cats/cats/autoconf.c
diff -u src/sys/arch/cats/cats/autoconf.c:1.19 src/sys/arch/cats/cats/autoconf.c:1.20
--- src/sys/arch/cats/cats/autoconf.c:1.19 Wed Apr 2 11:35:36 2014
+++ src/sys/arch/cats/cats/autoconf.c Thu Sep 29 06:46:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.19 2014/04/02 11:35:36 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.20 2022/09/29 06:46:17 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2014/04/02 11:35:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2022/09/29 06:46:17 skrll Exp $");
#include "opt_md.h"
@@ -104,7 +104,7 @@ static void
set_root_device(void)
{
char *ptr;
-
+
if (boot_file)
get_device(boot_file);
if (boot_args &&
@@ -174,7 +174,7 @@ device_register(device_t dev, void *aux)
*/
struct pci_attach_args *pa = aux;
if (((pa)->pa_bus == 0
- && (pa)->pa_device == 16
+ && (pa)->pa_device == 16
&& (pa)->pa_function == 0)) {
if (prop_dictionary_set_bool(device_properties(dev),
"ali1543-ide-force-compat-mode",
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: skrll Date: Thu Sep 29 06:46:17 UTC 2022 Modified Files: src/sys/arch/cats/cats: autoconf.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cats/cats/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/cats
Module Name:src Committed By: skrll Date: Sat Jan 8 09:02:47 UTC 2022 Modified Files: src/sys/arch/cats/cats: cats_machdep.c src/sys/arch/cats/conf: files.cats Log Message: defflag FCOM_INIT_ARM To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/arch/cats/cats/cats_machdep.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/cats/conf/files.cats Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/cats
Module Name:src Committed By: skrll Date: Sat Jan 8 09:02:47 UTC 2022 Modified Files: src/sys/arch/cats/cats: cats_machdep.c src/sys/arch/cats/conf: files.cats Log Message: defflag FCOM_INIT_ARM To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/arch/cats/cats/cats_machdep.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/cats/conf/files.cats 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/cats/cats/cats_machdep.c diff -u src/sys/arch/cats/cats/cats_machdep.c:1.92 src/sys/arch/cats/cats/cats_machdep.c:1.93 --- src/sys/arch/cats/cats/cats_machdep.c:1.92 Fri Aug 27 09:29:05 2021 +++ src/sys/arch/cats/cats/cats_machdep.c Sat Jan 8 09:02:47 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: cats_machdep.c,v 1.92 2021/08/27 09:29:05 skrll Exp $ */ +/* $NetBSD: cats_machdep.c,v 1.93 2022/01/08 09:02:47 skrll Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,9 +40,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.92 2021/08/27 09:29:05 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.93 2022/01/08 09:02:47 skrll Exp $"); #include "opt_arm_debug.h" +#include "opt_cats.h" #include "opt_ddb.h" #include "opt_modular.h" Index: src/sys/arch/cats/conf/files.cats diff -u src/sys/arch/cats/conf/files.cats:1.38 src/sys/arch/cats/conf/files.cats:1.39 --- src/sys/arch/cats/conf/files.cats:1.38 Fri Apr 4 07:33:53 2014 +++ src/sys/arch/cats/conf/files.cats Sat Jan 8 09:02:47 2022 @@ -1,4 +1,4 @@ -# $NetBSD: files.cats,v 1.38 2014/04/04 07:33:53 skrll Exp $ +# $NetBSD: files.cats,v 1.39 2022/01/08 09:02:47 skrll Exp $ # # CATS-specific configuration info # @@ -19,6 +19,7 @@ defflag XSERVER # ABLE booting ELF kernels defflag ABLEELF +defflag opt_cats.h FCOM_INIT_ARM # # ISA and mixed ISA+EISA or ISA+PCI drivers #
CVS commit: src/sys/arch/cats/cats
Module Name:src
Committed By: skrll
Date: Fri Aug 27 09:29:05 UTC 2021
Modified Files:
src/sys/arch/cats/cats: cats_machdep.c
Log Message:
Do the VPRINTF thing and #include "opt_arm/debug.h" for VERBOSE_INIT_ARM
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/cats/cats/cats_machdep.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/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.91 src/sys/arch/cats/cats/cats_machdep.c:1.92
--- src/sys/arch/cats/cats/cats_machdep.c:1.91 Fri Aug 27 09:23:27 2021
+++ src/sys/arch/cats/cats/cats_machdep.c Fri Aug 27 09:29:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.91 2021/08/27 09:23:27 skrll Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.92 2021/08/27 09:29:05 skrll Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,8 +40,9 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.91 2021/08/27 09:23:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.92 2021/08/27 09:29:05 skrll Exp $");
+#include "opt_arm_debug.h"
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -86,6 +87,12 @@ __KERNEL_RCSID(0, "$NetBSD: cats_machdep
#include
#endif
+#ifdef VERBOSE_INIT_ARM
+#define VPRINTF(...) printf(__VA_ARGS__)
+#else
+#define VPRINTF(...) __nothing
+#endif
+
/* Kernel text starts at the base of the kernel address space. */
#define KERNEL_TEXT_BASE (KERNEL_BASE + 0x)
#define KERNEL_VM_BASE (KERNEL_BASE + 0x0100)
@@ -269,23 +276,21 @@ initarm(void *arm_bootargs)
panic("Incompatible magic number %#x passed in boot args",
ebsabootinfo.bt_magic);
-#ifdef VERBOSE_INIT_ARM
/* output the incoming bootinfo */
- printf("bootinfo @ %p\n", arm_bootargs);
- printf("bt_magic= 0x%08x\n", ebsabootinfo.bt_magic);
- printf("bt_vargp= 0x%08x\n", ebsabootinfo.bt_vargp);
- printf("bt_pargp= 0x%08x\n", ebsabootinfo.bt_pargp);
- printf("bt_args @ %p, contents = \"%s\"\n", ebsabootinfo.bt_args, ebsabootinfo.bt_args);
- printf("bt_l1 = %p\n", ebsabootinfo.bt_l1);
-
- printf("bt_memstart = 0x%08x\n", ebsabootinfo.bt_memstart);
- printf("bt_memend = 0x%08x\n", ebsabootinfo.bt_memend);
- printf("bt_memavail = 0x%08x\n", ebsabootinfo.bt_memavail);
- printf("bt_fclk = 0x%08x\n", ebsabootinfo.bt_fclk);
- printf("bt_pciclk = 0x%08x\n", ebsabootinfo.bt_pciclk);
- printf("bt_vers = 0x%08x\n", ebsabootinfo.bt_vers);
- printf("bt_features = 0x%08x\n", ebsabootinfo.bt_features);
-#endif
+ VPRINTF("bootinfo @ %p\n", arm_bootargs);
+ VPRINTF("bt_magic= 0x%08x\n", ebsabootinfo.bt_magic);
+ VPRINTF("bt_vargp= 0x%08x\n", ebsabootinfo.bt_vargp);
+ VPRINTF("bt_pargp= 0x%08x\n", ebsabootinfo.bt_pargp);
+ VPRINTF("bt_args @ %p, contents = \"%s\"\n", ebsabootinfo.bt_args, ebsabootinfo.bt_args);
+ VPRINTF("bt_l1 = %p\n", ebsabootinfo.bt_l1);
+
+ VPRINTF("bt_memstart = 0x%08x\n", ebsabootinfo.bt_memstart);
+ VPRINTF("bt_memend = 0x%08x\n", ebsabootinfo.bt_memend);
+ VPRINTF("bt_memavail = 0x%08x\n", ebsabootinfo.bt_memavail);
+ VPRINTF("bt_fclk = 0x%08x\n", ebsabootinfo.bt_fclk);
+ VPRINTF("bt_pciclk = 0x%08x\n", ebsabootinfo.bt_pciclk);
+ VPRINTF("bt_vers = 0x%08x\n", ebsabootinfo.bt_vers);
+ VPRINTF("bt_features = 0x%08x\n", ebsabootinfo.bt_features);
/*
* Examine the boot args string for options we need to know about
@@ -301,7 +306,7 @@ initarm(void *arm_bootargs)
#ifdef MEMSIZE
if (ram_size == 0 || ram_size > (unsigned)MEMSIZE * 1024 * 1024)
ram_size = (unsigned)MEMSIZE * 1024 * 1024;
- DPRINTF("ram_size = 0x%x\n", (int)ram_size);
+ VPRINTF("ram_size = 0x%x\n", (int)ram_size);
#else
KASSERTMSG(ram_size > 0, "RAM size unknown and MEMSIZE undefined");
#endif
@@ -388,9 +393,7 @@ initarm(void *arm_bootargs)
extern int footbridge_isa_dma_nranges;
#endif
-#if 0
- printf("%zu: %lx -> %lx\n", i, start, end - 1);
-#endif
+ VPRINTF("%zu: 0x08%lx -> 0x08%lx\n", i, start, end - 1);
#if NISADMA > 0
if (arm32_dma_range_intersect(footbridge_isa_dma_ranges,
@@ -400,10 +403,8 @@ initarm(void *arm_bootargs)
* Place the pages that intersect with the
* ISA DMA range onto the ISA DMA free list.
*/
-#if 0
- printf("ISADMA 0x%lx -> 0x%lx\n", istart,
+ VPRINTF("ISADMA 0x08%lx -> 0x%08lx\n", istart,
istart + isize - 1);
-#endif
bp = &cats_physmem[ncats_physmem++];
KASSERT(ncats_physmem < MAX_PHYSMEM);
bp->bp_start = atop(istart);
@@ -415,10 +416,8 @@ initarm(void *arm_bootargs)
* intersection onto the default free list.
*/
if (start < istart) {
-#if 0
-printf("BEFORE 0x%lx -> 0x%lx\n",
+VPRINTF("BEFORE 0x08%lx -> 0x08%lx\n",
start, istart - 1);
-#endif
bp = &cats_physmem[ncats_physmem++];
KASSERT(ncats_physmem < MAX_PHYSMEM);
bp->bp_start = atop(start);
@@ -431,10 +430,8 @@ initarm(void *arm_bootarg
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: skrll Date: Fri Aug 27 09:29:05 UTC 2021 Modified Files: src/sys/arch/cats/cats: cats_machdep.c Log Message: Do the VPRINTF thing and #include "opt_arm/debug.h" for VERBOSE_INIT_ARM To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/cats/cats/cats_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: skrll Date: Fri Aug 27 09:23:28 UTC 2021 Modified Files: src/sys/arch/cats/cats: cats_machdep.c Log Message: initarm_common already calls db_machine_init, so don't do it for a second time otherwise the handlers list just loops. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/cats/cats/cats_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: skrll Date: Fri Aug 27 09:23:28 UTC 2021 Modified Files: src/sys/arch/cats/cats: cats_machdep.c Log Message: initarm_common already calls db_machine_init, so don't do it for a second time otherwise the handlers list just loops. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/cats/cats/cats_machdep.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/cats/cats/cats_machdep.c diff -u src/sys/arch/cats/cats/cats_machdep.c:1.90 src/sys/arch/cats/cats/cats_machdep.c:1.91 --- src/sys/arch/cats/cats/cats_machdep.c:1.90 Fri Aug 27 09:14:55 2021 +++ src/sys/arch/cats/cats/cats_machdep.c Fri Aug 27 09:23:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cats_machdep.c,v 1.90 2021/08/27 09:14:55 skrll Exp $ */ +/* $NetBSD: cats_machdep.c,v 1.91 2021/08/27 09:23:27 skrll Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.90 2021/08/27 09:14:55 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.91 2021/08/27 09:23:27 skrll Exp $"); #include "opt_ddb.h" #include "opt_modular.h" @@ -475,7 +475,6 @@ initarm(void *arm_bootargs) #endif #ifdef DDB - db_machine_init(); if (boothowto & RB_KDB) Debugger(); #endif
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: skrll Date: Fri Aug 27 09:14:55 UTC 2021 Modified Files: src/sys/arch/cats/cats: cats_machdep.c Log Message: lower case for hex values. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/arch/cats/cats/cats_machdep.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/cats/cats/cats_machdep.c diff -u src/sys/arch/cats/cats/cats_machdep.c:1.89 src/sys/arch/cats/cats/cats_machdep.c:1.90 --- src/sys/arch/cats/cats/cats_machdep.c:1.89 Sat Apr 18 11:00:38 2020 +++ src/sys/arch/cats/cats/cats_machdep.c Fri Aug 27 09:14:55 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cats_machdep.c,v 1.89 2020/04/18 11:00:38 skrll Exp $ */ +/* $NetBSD: cats_machdep.c,v 1.90 2021/08/27 09:14:55 skrll Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.89 2020/04/18 11:00:38 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.90 2021/08/27 09:14:55 skrll Exp $"); #include "opt_ddb.h" #include "opt_modular.h" @@ -98,7 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: cats_machdep /* * Size of available KVM space, note that growkernel will grow into this. */ -#define KERNEL_VM_SIZE 0x0C00 +#define KERNEL_VM_SIZE 0x0c00 /* * Address to call from cpu_reset() to reset the machine.
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: skrll Date: Fri Aug 27 09:14:55 UTC 2021 Modified Files: src/sys/arch/cats/cats: cats_machdep.c Log Message: lower case for hex values. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/arch/cats/cats/cats_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/cats/include
Module Name:src
Committed By: skrll
Date: Sun Aug 22 07:00:41 UTC 2021
Modified Files:
src/sys/arch/cats/include: cyclone_boot.h
Log Message:
s/u_int32_t/uint32_t/
NFCI
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/cats/include/cyclone_boot.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/cats/include/cyclone_boot.h
diff -u src/sys/arch/cats/include/cyclone_boot.h:1.1 src/sys/arch/cats/include/cyclone_boot.h:1.2
--- src/sys/arch/cats/include/cyclone_boot.h:1.1 Wed Jun 20 22:14:34 2001
+++ src/sys/arch/cats/include/cyclone_boot.h Sun Aug 22 07:00:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cyclone_boot.h,v 1.1 2001/06/20 22:14:34 chris Exp $ */
+/* $NetBSD: cyclone_boot.h,v 1.2 2021/08/22 07:00:41 skrll Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -43,18 +43,18 @@
*/
struct ebsaboot {
- u_int32_t bt_magic; /* boot info magic number */
- u_int32_t bt_vargp; /* virtual addr of arg page */
- u_int32_t bt_pargp; /* physical addr of arg page */
+ uint32_t bt_magic; /* boot info magic number */
+ uint32_t bt_vargp; /* virtual addr of arg page */
+ uint32_t bt_pargp; /* physical addr of arg page */
const char * bt_args; /* kernel args string pointer */
pd_entry_t * bt_l1; /* active L1 page table */
- u_int32_t bt_memstart; /* start of physical memory */
- u_int32_t bt_memend; /* end of physical memory */
- u_int32_t bt_memavail; /* start of avail phys memory */
- u_int32_t bt_fclk; /* fclk frequency */
- u_int32_t bt_pciclk; /* PCI bus frequency */
- u_int32_t bt_vers; /* structure version (CATS) */
- u_int32_t bt_features; /* feature mask (CATS) */
+ uint32_t bt_memstart; /* start of physical memory */
+ uint32_t bt_memend; /* end of physical memory */
+ uint32_t bt_memavail; /* start of avail phys memory */
+ uint32_t bt_fclk; /* fclk frequency */
+ uint32_t bt_pciclk; /* PCI bus frequency */
+ uint32_t bt_vers; /* structure version (CATS) */
+ uint32_t bt_features; /* feature mask (CATS) */
};
#define BT_MAGIC_NUMBER_EBSA 0x45425341
CVS commit: src/sys/arch/cats/include
Module Name:src Committed By: skrll Date: Sun Aug 22 07:00:41 UTC 2021 Modified Files: src/sys/arch/cats/include: cyclone_boot.h Log Message: s/u_int32_t/uint32_t/ NFCI To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/cats/include/cyclone_boot.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/cats/pci
Module Name:src Committed By: skrll Date: Thu Jan 14 10:32:49 UTC 2010 Modified Files: src/sys/arch/cats/pci: pcib.c Log Message: s/PCI_PRODUCT_ALI_M1543/PCI_PRODUCT_ALI_M1533/ now that dsl@ has fixed pcidevs. Hi dsl! To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/cats/pci/pcib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
