Browse Source

More small cleanups

A few formatting nits and removing an unused file.

Signed-off-by: Dan Cross <cross@gajendra.net>
Dan Cross 3 years ago
parent
commit
7ac5ee6cd8
6 changed files with 59 additions and 30 deletions
  1. 28 2
      sys/src/9/386/devrtc.c
  2. 0 23
      sys/src/9/amd64/iob.h
  3. 1 1
      sys/src/9/amd64/sdata.c
  4. 28 2
      sys/src/9/boot/settime.c
  5. 1 1
      sys/src/9/ip/ip.h
  6. 1 1
      sys/src/9/ip/tcp.c

+ 28 - 2
sys/src/9/386/devrtc.c

@@ -352,9 +352,35 @@ Dev rtcdevtab = {
  *  days per month plus days/year
  */
 static int dmsize[] = {
-	365, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+	365,
+	31,
+	28,
+	31,
+	30,
+	31,
+	30,
+	31,
+	31,
+	30,
+	31,
+	30,
+	31,
+};
 static int ldmsize[] = {
-	366, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+	366,
+	31,
+	29,
+	31,
+	30,
+	31,
+	30,
+	31,
+	31,
+	30,
+	31,
+	30,
+	31,
+};
 
 /*
  *  return the days/month for the given year

+ 0 - 23
sys/src/9/amd64/iob.h

@@ -1,23 +0,0 @@
-/*
- * This file is part of the UCB release of Plan 9. It is subject to the license
- * terms in the LICENSE file found in the top-level directory of this
- * distribution and at http://akaros.cs.berkeley.edu/files/Plan9License. No
- * part of the UCB release of Plan 9, including this file, may be copied,
- * modified, propagated, or distributed except according to the terms contained
- * in the LICENSE file.
- */
-
-/* io bufs */
-void iobufinit(void);
-Block *va2block(void *);
-void *io2alloc(uint);
-Block *bigalloc(void);
-Block *sbigalloc(void);
-int isbigblock(Block *);
-
-/* bal.c */
-physaddr bal(usize);
-void bfree(physaddr, usize);
-void balinit(physaddr, usize);
-void balfreephys(physaddr, usize);
-void baldump(void);

+ 1 - 1
sys/src/9/amd64/sdata.c

@@ -2093,7 +2093,7 @@ atapnp(void)
 		case(0x266F << 16) | 0x8086: /* 82801FB (ICH6) */
 		case(0x27DF << 16) | 0x8086: /* 82801G SATA (ICH7) */
 		case(0x27C0 << 16) | 0x8086: /* 82801GB SATA AHCI (ICH7) */
-			//		case (0x27C4<<16)|0x8086:	/* 82801GBM SATA (ICH7) */
+		// case (0x27C4<<16)|0x8086:	/* 82801GBM SATA (ICH7) */
 		case(0x27C5 << 16) | 0x8086: /* 82801GBM SATA AHCI (ICH7) */
 		case(0x2920 << 16) | 0x8086: /* 82801(IB)/IR/IH/IO SATA IDE (ICH9) */
 		case(0x3a20 << 16) | 0x8086: /* 82801JI (ICH10) */

+ 28 - 2
sys/src/9/boot/settime.c

@@ -103,9 +103,35 @@ g2(char **pp)
  *  days per month plus days/year
  */
 static int dmsize[] = {
-	365, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+	365,
+	31,
+	28,
+	31,
+	30,
+	31,
+	30,
+	31,
+	31,
+	30,
+	31,
+	30,
+	31,
+};
 static int ldmsize[] = {
-	366, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+	366,
+	31,
+	29,
+	31,
+	30,
+	31,
+	30,
+	31,
+	31,
+	30,
+	31,
+	30,
+	31,
+};
 
 /*
  *  return the days/month for the given year

+ 1 - 1
sys/src/9/ip/ip.h

@@ -449,7 +449,7 @@ struct v6params {
 	Hostparams hp;
 	v6router v6rlist[3]; /* max 3 default routers, currently */
 	int cdrouter;	     /* uses only v6rlist[cdrouter] if   */
-	/* cdrouter >= 0. */
+			     /* cdrouter >= 0. */
 };
 
 int Fsconnected(Conv *, char *);

+ 1 - 1
sys/src/9/ip/tcp.c

@@ -224,7 +224,7 @@ struct Tcpctl {
 		int retransmit; /* retransmit 1 packet @ una flag */
 		int rto;
 		uint32_t rxt; /* right window marker for recovery */
-		/* "recover" rfc3782 */
+			      /* "recover" rfc3782 */
 	} snd;
 	struct {
 		uint32_t nxt;  /* Receive pointer to next uint8_t slot */