CVS commit: src/sys/arch/arm/mainbus
Module Name:src Committed By: skrll Date: Tue Jan 28 07:47:26 UTC 2020 Modified Files: src/sys/arch/arm/mainbus: cpu_mainbus.c Log Message: Traiing whitespace To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/mainbus/cpu_mainbus.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/arm/mainbus
Module Name:src Committed By: skrll Date: Tue Jan 28 07:47:26 UTC 2020 Modified Files: src/sys/arch/arm/mainbus: cpu_mainbus.c Log Message: Traiing whitespace To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/mainbus/cpu_mainbus.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/arm/mainbus/cpu_mainbus.c diff -u src/sys/arch/arm/mainbus/cpu_mainbus.c:1.16 src/sys/arch/arm/mainbus/cpu_mainbus.c:1.17 --- src/sys/arch/arm/mainbus/cpu_mainbus.c:1.16 Wed Oct 29 14:14:14 2014 +++ src/sys/arch/arm/mainbus/cpu_mainbus.c Tue Jan 28 07:47:26 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_mainbus.c,v 1.16 2014/10/29 14:14:14 skrll Exp $ */ +/* $NetBSD: cpu_mainbus.c,v 1.17 2020/01/28 07:47:26 skrll Exp $ */ /* * Copyright (c) 1995 Mark Brinicombe. @@ -45,7 +45,7 @@ #include "opt_multiprocessor.h" #include -__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.16 2014/10/29 14:14:14 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.17 2020/01/28 07:47:26 skrll Exp $"); #include #include @@ -60,19 +60,19 @@ __KERNEL_RCSID(0, "$NetBSD: cpu_mainbus. */ static int cpu_mainbus_match(device_t, cfdata_t, void *); static void cpu_mainbus_attach(device_t, device_t, void *); - + /* * int cpumatch(device_t parent, cfdata_t cf, void *aux) * * Probe for the main cpu. Currently all this does is return 1 to * indicate that the cpu was found. - */ + */ #ifdef MULTIPROCESSOR extern u_int arm_cpu_max; #else #define arm_cpu_max 1 #endif - + static int cpu_mainbus_match(device_t parent, cfdata_t cf, void *aux) { @@ -113,7 +113,7 @@ cpu_mainbus_match(device_t parent, cfdat * * Attach the main cpu */ - + static void cpu_mainbus_attach(device_t parent, device_t self, void *aux) {
CVS commit: src/sys/arch/arm/mainbus
Module Name:src Committed By: matt Date: Thu Jun 5 03:46:26 UTC 2014 Modified Files: src/sys/arch/arm/mainbus: cpu_mainbus.c mainbus.c Log Message: Cleanup a few MULTIPROCESSOR issues. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/mainbus/cpu_mainbus.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/mainbus/mainbus.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/arm/mainbus/cpu_mainbus.c diff -u src/sys/arch/arm/mainbus/cpu_mainbus.c:1.14 src/sys/arch/arm/mainbus/cpu_mainbus.c:1.15 --- src/sys/arch/arm/mainbus/cpu_mainbus.c:1.14 Fri Mar 28 21:43:01 2014 +++ src/sys/arch/arm/mainbus/cpu_mainbus.c Thu Jun 5 03:46:26 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_mainbus.c,v 1.14 2014/03/28 21:43:01 matt Exp $ */ +/* $NetBSD: cpu_mainbus.c,v 1.15 2014/06/05 03:46:26 matt Exp $ */ /* * Copyright (c) 1995 Mark Brinicombe. @@ -44,7 +44,7 @@ #include locators.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu_mainbus.c,v 1.14 2014/03/28 21:43:01 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu_mainbus.c,v 1.15 2014/06/05 03:46:26 matt Exp $); #include sys/param.h #include sys/systm.h @@ -79,24 +79,31 @@ cpu_mainbus_match(device_t parent, cfdat int id = mb-mb_core; if (id != MAINBUSCF_CORE_DEFAULT) { - if (id = arm_cpu_max || kcpuset_isset(kcpuset_attached, id)) + if (id == 0) + return cpu_info_store.ci_dev == NULL; + if (id = arm_cpu_max) return 0; - if (id == 0 cpu_info_store.ci_dev != NULL) +#ifdef MULTIPROCESSOR + if (cpu_info[id] != NULL) return 0; +#endif + return 1; + } + + if (cpu_info_store.ci_dev == NULL) { + mb-mb_core = 0; return 1; } - for (id = 0; id arm_cpu_max; id++) { #ifdef MULTIPROCESSOR - if (cpu_info[id] != NULL cpu_info[id]-ci_dev != NULL) + for (id = 1; id arm_cpu_max; id++) { + if (cpu_info[id] != NULL) continue; -#else - if (id != 0 || cpu_info_store.ci_dev != NULL) - continue; -#endif mb-mb_core = id; return 1; } +#endif + return 0; } Index: src/sys/arch/arm/mainbus/mainbus.c diff -u src/sys/arch/arm/mainbus/mainbus.c:1.20 src/sys/arch/arm/mainbus/mainbus.c:1.21 --- src/sys/arch/arm/mainbus/mainbus.c:1.20 Wed Aug 29 23:16:35 2012 +++ src/sys/arch/arm/mainbus/mainbus.c Thu Jun 5 03:46:26 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.20 2012/08/29 23:16:35 matt Exp $ */ +/* $NetBSD: mainbus.c,v 1.21 2014/06/05 03:46:26 matt Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe. @@ -42,7 +42,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.20 2012/08/29 23:16:35 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.21 2014/06/05 03:46:26 matt Exp $); #include sys/param.h #include sys/systm.h @@ -151,7 +151,9 @@ mainbussearch(device_t parent, cfdata_t tryagain = 0; if (config_match(parent, cf, mb) 0) { config_attach(parent, cf, mb, mainbusprint); -/* tryagain = (cf-cf_fstate == FSTATE_STAR);*/ +#ifdef MULTIPROCESSOR + tryagain = (cf-cf_fstate == FSTATE_STAR); +#endif } } while (tryagain);
CVS commit: src/sys/arch/arm/mainbus
Module Name:src Committed By: matt Date: Thu Jun 5 03:46:26 UTC 2014 Modified Files: src/sys/arch/arm/mainbus: cpu_mainbus.c mainbus.c Log Message: Cleanup a few MULTIPROCESSOR issues. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/mainbus/cpu_mainbus.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/mainbus/mainbus.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/arm/mainbus
Module Name:src Committed By: matt Date: Fri Mar 28 21:43:01 UTC 2014 Modified Files: src/sys/arch/arm/mainbus: cpu_mainbus.c Log Message: arm_cpu_max = num of cpus To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/mainbus/cpu_mainbus.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/arm/mainbus/cpu_mainbus.c diff -u src/sys/arch/arm/mainbus/cpu_mainbus.c:1.13 src/sys/arch/arm/mainbus/cpu_mainbus.c:1.14 --- src/sys/arch/arm/mainbus/cpu_mainbus.c:1.13 Wed Aug 29 23:16:35 2012 +++ src/sys/arch/arm/mainbus/cpu_mainbus.c Fri Mar 28 21:43:01 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_mainbus.c,v 1.13 2012/08/29 23:16:35 matt Exp $ */ +/* $NetBSD: cpu_mainbus.c,v 1.14 2014/03/28 21:43:01 matt Exp $ */ /* * Copyright (c) 1995 Mark Brinicombe. @@ -44,7 +44,7 @@ #include locators.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu_mainbus.c,v 1.13 2012/08/29 23:16:35 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu_mainbus.c,v 1.14 2014/03/28 21:43:01 matt Exp $); #include sys/param.h #include sys/systm.h @@ -69,7 +69,7 @@ static void cpu_mainbus_attach(device_t, #ifdef MULTIPROCESSOR extern u_int arm_cpu_max; #else -#define arm_cpu_max 0 +#define arm_cpu_max 1 #endif static int @@ -79,14 +79,14 @@ cpu_mainbus_match(device_t parent, cfdat int id = mb-mb_core; if (id != MAINBUSCF_CORE_DEFAULT) { - if (id arm_cpu_max || kcpuset_isset(kcpuset_attached, id)) + if (id = arm_cpu_max || kcpuset_isset(kcpuset_attached, id)) return 0; if (id == 0 cpu_info_store.ci_dev != NULL) return 0; return 1; } - for (id = 0; id = arm_cpu_max; id++) { + for (id = 0; id arm_cpu_max; id++) { #ifdef MULTIPROCESSOR if (cpu_info[id] != NULL cpu_info[id]-ci_dev != NULL) continue;
CVS commit: src/sys/arch/arm/mainbus
Module Name:src Committed By: matt Date: Fri Mar 28 21:43:01 UTC 2014 Modified Files: src/sys/arch/arm/mainbus: cpu_mainbus.c Log Message: arm_cpu_max = num of cpus To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/mainbus/cpu_mainbus.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/arm/mainbus
Module Name:src Committed By: matt Date: Tue Sep 4 00:21:08 UTC 2012 Modified Files: src/sys/arch/arm/mainbus: mainbus.h Log Message: Add multiple inclusion protection. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/mainbus/mainbus.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/arm/mainbus/mainbus.h diff -u src/sys/arch/arm/mainbus/mainbus.h:1.4 src/sys/arch/arm/mainbus/mainbus.h:1.5 --- src/sys/arch/arm/mainbus/mainbus.h:1.4 Wed Aug 29 23:16:35 2012 +++ src/sys/arch/arm/mainbus/mainbus.h Tue Sep 4 00:21:08 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.h,v 1.4 2012/08/29 23:16:35 matt Exp $ */ +/* $NetBSD: mainbus.h,v 1.5 2012/09/04 00:21:08 matt Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe. @@ -41,6 +41,9 @@ * Created : 15/12/94 */ +#ifndef _ARM_MAINBUS_MAINBUS_H_ +#define _ARM_MAINBUS_MAINBUS_H_ + #include sys/bus.h /* @@ -58,4 +61,4 @@ struct mainbus_attach_args { bus_space_tag_t mb_iot; /* bus space tag */ }; -/* End of mainbus.h */ +#endif /* _ARM_MAINBUS_MAINBUS_H_ */
CVS commit: src/sys/arch/arm/mainbus
Module Name:src Committed By: matt Date: Tue Sep 4 00:21:08 UTC 2012 Modified Files: src/sys/arch/arm/mainbus: mainbus.h Log Message: Add multiple inclusion protection. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/mainbus/mainbus.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/arm/mainbus
Module Name:src Committed By: matt Date: Sun Jul 15 20:53:23 UTC 2012 Modified Files: src/sys/arch/arm/mainbus: mainbus_io.c Log Message: Add stream methods To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/mainbus/mainbus_io.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/arm/mainbus/mainbus_io.c diff -u src/sys/arch/arm/mainbus/mainbus_io.c:1.21 src/sys/arch/arm/mainbus/mainbus_io.c:1.22 --- src/sys/arch/arm/mainbus/mainbus_io.c:1.21 Fri Jul 1 20:31:39 2011 +++ src/sys/arch/arm/mainbus/mainbus_io.c Sun Jul 15 20:53:23 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus_io.c,v 1.21 2011/07/01 20:31:39 dyoung Exp $ */ +/* $NetBSD: mainbus_io.c,v 1.22 2012/07/15 20:53:23 matt Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe. @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mainbus_io.c,v 1.21 2011/07/01 20:31:39 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: mainbus_io.c,v 1.22 2012/07/15 20:53:23 matt Exp $); #include sys/param.h #include sys/systm.h @@ -129,6 +129,45 @@ struct bus_space mainbus_bs_tag = { bs_notimpl_bs_c_2, bs_notimpl_bs_c_4, bs_notimpl_bs_c_8, + +#ifdef __BUS_SPACE_HAS_STREAM_METHODS + /* stream methods */ + /* read (single) */ + mainbus_bs_r_1, + mainbus_bs_r_2, + mainbus_bs_r_4, + bs_notimpl_bs_r_8, + + /* read multiple */ + bs_notimpl_bs_rm_1, + mainbus_bs_rm_2, + bs_notimpl_bs_rm_4, + bs_notimpl_bs_rm_8, + + /* read region */ + bs_notimpl_bs_rr_1, + bs_notimpl_bs_rr_2, + bs_notimpl_bs_rr_4, + bs_notimpl_bs_rr_8, + + /* write (single) */ + mainbus_bs_w_1, + mainbus_bs_w_2, + mainbus_bs_w_4, + bs_notimpl_bs_w_8, + + /* write multiple */ + mainbus_bs_wm_1, + mainbus_bs_wm_2, + bs_notimpl_bs_wm_4, + bs_notimpl_bs_wm_8, + + /* write region */ + bs_notimpl_bs_wr_1, + bs_notimpl_bs_wr_2, + bs_notimpl_bs_wr_4, + bs_notimpl_bs_wr_8, +#endif }; /* bus space functions */
CVS commit: src/sys/arch/arm/mainbus
Module Name:src Committed By: matt Date: Sun Jul 15 20:53:23 UTC 2012 Modified Files: src/sys/arch/arm/mainbus: mainbus_io.c Log Message: Add stream methods To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/mainbus/mainbus_io.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.