summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorkstailey <kstailey@cvs.openbsd.org>1997-06-26 17:07:13 +0000
committerkstailey <kstailey@cvs.openbsd.org>1997-06-26 17:07:13 +0000
commit736523ed8970c120dd3aa549471822b95cd2b72e (patch)
tree81bf24a3b7cff4c5a17604d8dae7ef8935f484cc /sys/arch/i386
parentfb44687745c447b8a6ed41e0212b271d4e862842 (diff)
fixup crazy indentation in Bread()
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/boot/disk.c41
1 files changed, 21 insertions, 20 deletions
diff --git a/sys/arch/i386/boot/disk.c b/sys/arch/i386/boot/disk.c
index 2769b1cf7fa..5932926dcf8 100644
--- a/sys/arch/i386/boot/disk.c
+++ b/sys/arch/i386/boot/disk.c
@@ -122,7 +122,7 @@ devopen()
dkbbnum *= lp->d_secsize / DEV_BSIZE;
do_bad144 = 0;
for (i = 5; i; i--) {
- /* XXX: what if the "DOS sector" < 512 bytes ??? */
+ /* XXX: what if the "DOS sector" < 512 bytes ??? */
Bread(dkbbnum, iobuf);
dkbptr = (struct dkbad *)&iobuf[0];
/* XXX why is this not in <sys/dkbad.h> ??? */
@@ -171,21 +171,21 @@ Bread(sector, addr)
int sector;
void *addr;
{
- extern int ourseg;
- int dmalimit = ((((ourseg<<4)+(int)ra_buf)+65536) & ~65535)
- - ((ourseg<<4)+ (int)ra_buf);
- if (dmalimit<RA_SECTORS*BPS) {
- if (dmalimit*2<RA_SECTORS*BPS) {
- ra_sectors = (RA_SECTORS*BPS-dmalimit)/BPS;
- ra_skip = RA_SECTORS - ra_sectors;
- } else {
- ra_sectors = dmalimit/BPS;
- ra_skip = 0;
- }
- } else {
- ra_sectors = RA_SECTORS;
- ra_skip=0;
- }
+ extern int ourseg;
+ int dmalimit = ((((ourseg<<4)+(int)ra_buf)+65536) & ~65535)
+ - ((ourseg<<4)+ (int)ra_buf);
+ if (dmalimit<RA_SECTORS*BPS) {
+ if (dmalimit*2<RA_SECTORS*BPS) {
+ ra_sectors = (RA_SECTORS*BPS-dmalimit)/BPS;
+ ra_skip = RA_SECTORS - ra_sectors;
+ } else {
+ ra_sectors = dmalimit/BPS;
+ ra_skip = 0;
+ }
+ } else {
+ ra_sectors = RA_SECTORS;
+ ra_skip=0;
+ }
if (dosdev != ra_dev || sector < ra_first || sector >= ra_end) {
int cyl, head, sec, nsec;
@@ -194,10 +194,11 @@ Bread(sector, addr)
head = (sector % spc) / spt;
sec = sector % spt;
nsec = spt - sec;
- if (nsec > ra_sectors)
- nsec = ra_sectors;
+ if (nsec > ra_sectors)
+ nsec = ra_sectors;
twiddle();
- while (biosread(dosdev, cyl, head, sec, nsec, ra_buf+ra_skip*BPS)) {
+ while (biosread(dosdev, cyl, head, sec, nsec,
+ ra_buf+ra_skip*BPS)) {
printf("Error: C:%d H:%d S:%d\n", cyl, head, sec);
nsec = 1;
twiddle();
@@ -206,7 +207,7 @@ Bread(sector, addr)
ra_first = sector;
ra_end = sector + nsec;
}
- bcopy(ra_buf + (sector - ra_first+ra_skip) * BPS, addr, BPS);
+ bcopy(ra_buf + (sector - ra_first+ra_skip) * BPS, addr, BPS);
}
badsect(sector)