diff options
| -rw-r--r-- | sys/dev/isa/mcd.c | 30 | ||||
| -rw-r--r-- | sys/lib/libkern/Makefile | 4 | ||||
| -rw-r--r-- | sys/lib/libkern/bcd.c | 37 | ||||
| -rw-r--r-- | sys/lib/libkern/libkern.h | 6 |
4 files changed, 32 insertions, 45 deletions
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c index 78be09bfc3d..75e25f16dec 100644 --- a/sys/dev/isa/mcd.c +++ b/sys/dev/isa/mcd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcd.c,v 1.42 2007/04/29 22:22:34 krw Exp $ */ +/* $OpenBSD: mcd.c,v 1.43 2007/05/04 22:14:36 deraadt Exp $ */ /* $NetBSD: mcd.c,v 1.60 1998/01/14 12:14:41 drochner Exp $ */ /* @@ -148,6 +148,34 @@ struct mcd_softc { cdev_decl(mcd); bdev_decl(mcd); +u_int8_t const __bcd2bin[] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 0, 0, 0, 0, 0, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 0, 0, 0, 0, 0, 0, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 0, 0, 0, 0, 0, 0, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 0, 0, 0, 0, 0, 0, + 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 0, 0, 0, 0, 0, 0, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 0, 0, 0, 0, 0, 0, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 0, 0, 0, 0, 0, 0, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 0, 0, 0, 0, 0, 0, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99 +}; + +u_int8_t const __bin2bcd[] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99 +}; +#define bcd2bin(b) (__bcd2bin[(b)&0xff]) +#define bin2bcd(b) (__bin2bcd[(b)&0xff]) + static void hsg2msf(int, bcd_t *); static daddr_t msf2hsg(bcd_t *, int); diff --git a/sys/lib/libkern/Makefile b/sys/lib/libkern/Makefile index 19c0ae902d1..fc877d59c9a 100644 --- a/sys/lib/libkern/Makefile +++ b/sys/lib/libkern/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2004/11/28 07:20:25 mickey Exp $ +# $OpenBSD: Makefile,v 1.19 2007/05/04 22:14:37 deraadt Exp $ LIB= kern NOPIC= @@ -25,7 +25,7 @@ SRCS+= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \ .endif # Other stuff -SRCS+= getsn.c srandom.c bcd.c strchr.c +SRCS+= getsn.c srandom.c strchr.c # Files to clean up CLEANFILES+= lib${LIB}.o lib${LIB}.po diff --git a/sys/lib/libkern/bcd.c b/sys/lib/libkern/bcd.c deleted file mode 100644 index f3f119c19bd..00000000000 --- a/sys/lib/libkern/bcd.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Some data-tables that are often used. - * Cannot be copyrighted. - * from FreeBSD - */ - -#include <lib/libkern/libkern.h> - -u_int8_t const __bcd2bin[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 0, 0, 0, 0, 0, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 0, 0, 0, 0, 0, 0, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 0, 0, 0, 0, 0, 0, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 0, 0, 0, 0, 0, 0, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 0, 0, 0, 0, 0, 0, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 0, 0, 0, 0, 0, 0, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 0, 0, 0, 0, 0, 0, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 0, 0, 0, 0, 0, 0, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99 -}; - -u_int8_t const __bin2bcd[] = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, - 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, - 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, - 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, - 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, - 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, - 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, - 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, - 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99 -}; - -/* This is actually used with radix [2..36] */ -char const __hex2ascii[] = "0123456789abcdefghijklmnopqrstuvwxyz"; - diff --git a/sys/lib/libkern/libkern.h b/sys/lib/libkern/libkern.h index c92e2ce5f38..8b326f6f377 100644 --- a/sys/lib/libkern/libkern.h +++ b/sys/lib/libkern/libkern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libkern.h,v 1.22 2004/08/07 00:38:32 deraadt Exp $ */ +/* $OpenBSD: libkern.h,v 1.23 2007/05/04 22:14:37 deraadt Exp $ */ /* $NetBSD: libkern.h,v 1.7 1996/03/14 18:52:08 christos Exp $ */ /*- @@ -174,8 +174,4 @@ int getsn(char *, int); char *strchr(const char *, int); char *strrchr(const char *, int); -extern u_int8_t const __bcd2bin[], __bin2bcd[]; -#define bcd2bin(b) (__bcd2bin[(b)&0xff]) -#define bin2bcd(b) (__bin2bcd[(b)&0xff]) - #endif /* __LIBKERN_H__ */ |