Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sbmips Fix up some white-space bogons.
details: https://anonhg.NetBSD.org/src/rev/027d8ceaa49f
branches: trunk
changeset: 523855:027d8ceaa49f
user: simonb <simonb%NetBSD.org@localhost>
date: Sun Mar 17 06:28:56 2002 +0000
description:
Fix up some white-space bogons.
diffstat:
sys/arch/sbmips/include/leds.h | 3 +-
sys/arch/sbmips/sbmips/conf.c | 16 ++---
sys/arch/sbmips/sbmips/disksubr.c | 8 +-
sys/arch/sbmips/sbmips/machdep.c | 107 +++++++++++++++++++------------------
sys/arch/sbmips/sbmips/softintr.c | 24 ++++----
5 files changed, 80 insertions(+), 78 deletions(-)
diffs (truncated from 315 to 300 lines):
diff -r ac14426d57f2 -r 027d8ceaa49f sys/arch/sbmips/include/leds.h
--- a/sys/arch/sbmips/include/leds.h Sun Mar 17 06:24:30 2002 +0000
+++ b/sys/arch/sbmips/include/leds.h Sun Mar 17 06:28:56 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: leds.h,v 1.1 2002/03/06 02:13:44 simonb Exp $ */
+/* $NetBSD: leds.h,v 1.2 2002/03/17 06:28:56 simonb Exp $ */
/*
* Copyright 2000
@@ -36,4 +36,3 @@
/* XXX DOES NOT BELONG HERE */
void cswarm_setleds(const char *str);
-
diff -r ac14426d57f2 -r 027d8ceaa49f sys/arch/sbmips/sbmips/conf.c
--- a/sys/arch/sbmips/sbmips/conf.c Sun Mar 17 06:24:30 2002 +0000
+++ b/sys/arch/sbmips/sbmips/conf.c Sun Mar 17 06:28:56 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.2 2002/03/16 16:55:58 martin Exp $ */
+/* $NetBSD: conf.c,v 1.3 2002/03/17 06:28:57 simonb Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.2 2002/03/16 16:55:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.3 2002/03/17 06:28:57 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -284,7 +284,7 @@
cdev_disk_init(NSD,sd), /* 8: SCSI disk */
cdev_disk_init(NVND,vnd), /* 9: vnode disk driver */
cdev_fd_init(1,filedesc), /* 10: file descriptor pseudo-dev */
- cdev_bpftun_init(NBPFILTER,bpf),/* 11: Berkeley packet filter */
+ cdev_bpftun_init(NBPFILTER,bpf), /* 11: Berkeley packet filter */
cdev_tape_init(NST,st), /* 12: SCSI tape */
cdev_disk_init(NCD,cd), /* 13: SCSI CD-ROM */
cdev_ch_init(NCH,ch), /* 14: SCSI autochanger */
@@ -306,14 +306,12 @@
cdev_lkm_dummy(), /* 22 */
cdev_lkm_dummy(), /* 23 */
cdev_audio_init(NAUDIO,audio), /* 24: generic audio I/O */
- cdev_wsdisplay_init(NWSDISPLAY,
- wsdisplay), /* 25: frame buffers, etc. */
+ cdev_wsdisplay_init(NWSDISPLAY, wsdisplay), /* 25: frame buffers, etc. */
cdev_tty_init(NCOM,com), /* 26: ns16550 UART */
cdev_disk_init(NCCD,ccd), /* 27: concatenated disk driver */
cdev_disk_init(NMD,md), /* 28: memory disk driver */
cdev_mouse_init(NWSKBD, wskbd), /* 29: keyboards */
- cdev_mouse_init(NWSMOUSE,
- wsmouse), /* 30: mice */
+ cdev_mouse_init(NWSMOUSE, wsmouse), /* 30: mice */
cdev_lpt_init(NLPT,lpt), /* 31: parallel printer */
cdev_scanner_init(NSS,ss), /* 32: SCSI scanner */
cdev_uk_init(NUK,uk), /* 33: SCSI unknown */
@@ -336,7 +334,7 @@
cdev_midi_init(NSEQUENCER,sequencer), /* 50: sequencer I/O */
cdev_isdn_init(NISDN, isdn), /* 51: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 52: isdn control device */
- cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 53: isdn raw b-chnl access */
+ cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 53: isdn raw b-chnl access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 54: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 55: isdn phone device */
cdev_mouse_init(NWSMUX, wsmux), /* 56: ws multiplexor */
@@ -346,7 +344,7 @@
cdev_tty_init(NCY,cy), /* 60: Cyclades Cyclom-Y serial */
cdev_tty_init(NCZ,cztty), /* 61: Cyclades-Z serial */
cdev_usbdev_init(NURIO,urio), /* 62: Diamond Rio 500 */
- cdev_ugen_init(NUSCANNER,uscanner),/* 63: USB scanner */
+ cdev_ugen_init(NUSCANNER,uscanner), /* 63: USB scanner */
cdev_altq_init(NALTQ,altq), /* 64: ALTQ control interface */
cdev__oci_init(NMLX,mlx), /* 65: Mylex DAC960 control interface */
cdev_pci_init(NPCI,pci), /* 66: PCI bus access device */
diff -r ac14426d57f2 -r 027d8ceaa49f sys/arch/sbmips/sbmips/disksubr.c
--- a/sys/arch/sbmips/sbmips/disksubr.c Sun Mar 17 06:24:30 2002 +0000
+++ b/sys/arch/sbmips/sbmips/disksubr.c Sun Mar 17 06:28:56 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.1 2002/03/06 02:13:51 simonb Exp $ */
+/* $NetBSD: disksubr.c,v 1.2 2002/03/17 06:28:57 simonb Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -204,7 +204,8 @@
goto done;
}
for (dlp = (struct disklabel *)bp->b_data;
- dlp <= (struct disklabel *)(bp->b_data + lp->d_secsize - sizeof(*dlp));
+ dlp <= (struct disklabel *)
+ (bp->b_data + lp->d_secsize - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
if (msg == NULL)
@@ -381,7 +382,8 @@
if ((error = biowait(bp)) != 0)
goto done;
for (dlp = (struct disklabel *)bp->b_data;
- dlp <= (struct disklabel *)(bp->b_data + lp->d_secsize - sizeof(*dlp));
+ dlp <= (struct disklabel *)
+ (bp->b_data + lp->d_secsize - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic == DISKMAGIC && dlp->d_magic2 == DISKMAGIC &&
dkcksum(dlp) == 0) {
diff -r ac14426d57f2 -r 027d8ceaa49f sys/arch/sbmips/sbmips/machdep.c
--- a/sys/arch/sbmips/sbmips/machdep.c Sun Mar 17 06:24:30 2002 +0000
+++ b/sys/arch/sbmips/sbmips/machdep.c Sun Mar 17 06:28:56 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.1 2002/03/06 02:13:51 simonb Exp $ */
+/* $NetBSD: machdep.c,v 1.2 2002/03/17 06:28:57 simonb Exp $ */
/*
* Copyright 2000, 2001
@@ -255,53 +255,55 @@
#endif
printf("fwhandle=%08X magic=%08X bootdata=%08X reserved=%08X\n",
- (u_int) fwhandle,(u_int) magic,(u_int) bootdata,(u_int) reserved);
+ (u_int) fwhandle,(u_int) magic,(u_int) bootdata,(u_int) reserved);
if (magic == BOOTINFO_MAGIC) {
- int idx;
- int added;
- cfe_xuint_t start,len,type;
+ int idx;
+ int added;
+ cfe_xuint_t start,len,type;
- cfe_init(fwhandle);
- cfe_present = 1;
+ cfe_init(fwhandle);
+ cfe_present = 1;
- idx = 0;
- physmem = 0;
- mem_cluster_cnt = 0;
- while (cfe_getmeminfo(idx,&start,&len,&type) == 0) {
- added = 0;
- printf("Memory Block #%d start %08llX len %08llX: %s: ",idx,
- start,len,
- (type == CFE_MI_AVAILABLE) ? "Available" : "Reserved");
- if ((type == CFE_MI_AVAILABLE) && (mem_cluster_cnt < VM_PHYSSEG_MAX)) {
- /*
- * XXX Ignore memory above 256MB for now, it needs special
- * XXX handling.
- */
- if (start < (256*1024*1024)) {
- physmem += btoc(((int) len));
- mem_clusters[mem_cluster_cnt].start = (long) start;
- mem_clusters[mem_cluster_cnt].size = (long) len;
- mem_cluster_cnt++;
- added = 1;
+ idx = 0;
+ physmem = 0;
+ mem_cluster_cnt = 0;
+ while (cfe_getmeminfo(idx,&start,&len,&type) == 0) {
+ added = 0;
+ printf("Memory Block #%d start %08llX len %08llX: %s: ",
+ idx, start, len, (type == CFE_MI_AVAILABLE) ?
+ "Available" : "Reserved");
+ if ((type == CFE_MI_AVAILABLE) &&
+ (mem_cluster_cnt < VM_PHYSSEG_MAX)) {
+ /*
+ * XXX Ignore memory above 256MB for now, it
+ * XXX needs special handling.
+ */
+ if (start < (256*1024*1024)) {
+ physmem += btoc(((int) len));
+ mem_clusters[mem_cluster_cnt].start =
+ (long) start;
+ mem_clusters[mem_cluster_cnt].size =
+ (long) len;
+ mem_cluster_cnt++;
+ added = 1;
+ }
}
- }
- if (added)
- printf("added to map\n");
- else
- printf("not added to map\n");
- idx++;
+ if (added)
+ printf("added to map\n");
+ else
+ printf("not added to map\n");
+ idx++;
}
- }
- else {
- /*
- * Handle the case of not being called from the firmware.
- */
- mem_clusters[0].start = 0;
- mem_clusters[0].size = ctob(physmem);
- mem_cluster_cnt = 1;
- }
+ } else {
+ /*
+ * Handle the case of not being called from the firmware.
+ */
+ mem_clusters[0].start = 0;
+ mem_clusters[0].size = ctob(physmem);
+ mem_cluster_cnt = 1;
+ }
for (i = 0; i < sizeof(bootinfo.boot_flags); i++) {
@@ -311,7 +313,8 @@
case ' ':
continue;
case '-':
- while (bootinfo.boot_flags[i] != ' ' && bootinfo.boot_flags[i] != '\0') {
+ while (bootinfo.boot_flags[i] != ' ' &&
+ bootinfo.boot_flags[i] != '\0') {
switch (bootinfo.boot_flags[i]) {
case 'a':
boothowto |= RB_ASKNAME;
@@ -346,11 +349,11 @@
VM_FREELIST_DEFAULT);
for (i = 1; i < mem_cluster_cnt; i++) {
- first = round_page(mem_clusters[i].start);
- last = mem_clusters[i].start + mem_clusters[i].size;
- uvm_page_physload(atop(first), atop(last), atop(first), atop(last),
- VM_FREELIST_DEFAULT);
- }
+ first = round_page(mem_clusters[i].start);
+ last = mem_clusters[i].start + mem_clusters[i].size;
+ uvm_page_physload(atop(first), atop(last), atop(first),
+ atop(last), VM_FREELIST_DEFAULT);
+ }
/*
* Initialize error message buffer (at end of core).
@@ -446,7 +449,7 @@
panic("cpu_startup: not enough memory for "
"buffer cache");
pmap_kenter_pa(curbuf, VM_PAGE_TO_PHYS(pg),
- VM_PROT_READ|VM_PROT_WRITE);
+ VM_PROT_READ|VM_PROT_WRITE);
curbuf += PAGE_SIZE;
curbufsize -= PAGE_SIZE;
}
@@ -456,13 +459,13 @@
* Allocate a submap for exec arguments. This map effectively
* limits the number of processes exec'ing at any time.
*/
- exec_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
- 16 * NCARGS, VM_MAP_PAGEABLE, FALSE, NULL);
+ exec_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr, 16 * NCARGS,
+ VM_MAP_PAGEABLE, FALSE, NULL);
/*
* Allocate a submap for physio.
*/
- phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
- VM_PHYS_SIZE, 0, FALSE, NULL);
+ phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr, VM_PHYS_SIZE,
+ 0, FALSE, NULL);
/*
diff -r ac14426d57f2 -r 027d8ceaa49f sys/arch/sbmips/sbmips/softintr.c
--- a/sys/arch/sbmips/sbmips/softintr.c Sun Mar 17 06:24:30 2002 +0000
+++ b/sys/arch/sbmips/sbmips/softintr.c Sun Mar 17 06:28:56 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: softintr.c,v 1.1 2002/03/06 02:13:52 simonb Exp $ */
+/* $NetBSD: softintr.c,v 1.2 2002/03/17 06:28:57 simonb Exp $ */
/*
* Copyright 2000, 2001
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: softintr.c,v 1.1 2002/03/06 02:13:52 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: softintr.c,v 1.2 2002/03/17 06:28:57 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -187,22 +187,22 @@
static void
dosoftnet(void *unused)
{
- int n, s;
+ int n, s;
intrcnt[SOFTNET_INTR]++;
/* XXX could just use netintr! */
- s = splhigh();
- n = netisr;
- netisr = 0;
- splx(s);
+ s = splhigh();
+ n = netisr;
+ netisr = 0;
Home |
Main Index |
Thread Index |
Old Index