diff options
| -rw-r--r-- | sys/dev/atapi/acd.c | 87 | ||||
| -rw-r--r-- | sys/dev/atapi/atapi.h | 2 | ||||
| -rw-r--r-- | sys/dev/atapi/atapiconf.c | 2 | ||||
| -rw-r--r-- | sys/dev/atapi/atapilink.h | 2 | ||||
| -rw-r--r-- | sys/dev/atapi/files.atapi | 1 | ||||
| -rw-r--r-- | sys/dev/isa/wd.c | 1 | ||||
| -rw-r--r-- | sys/dev/isa/wdc.c | 1 | ||||
| -rw-r--r-- | sys/dev/isa/wdlink.h | 2 | ||||
| -rw-r--r-- | sys/dev/isa/wdreg.h | 1 |
9 files changed, 19 insertions, 80 deletions
diff --git a/sys/dev/atapi/acd.c b/sys/dev/atapi/acd.c index 3b95e279722..49775d33869 100644 --- a/sys/dev/atapi/acd.c +++ b/sys/dev/atapi/acd.c @@ -1,4 +1,4 @@ -/* $NetBSD: $ */ +/* $OpenBSD: acd.c,v 1.2 1996/06/09 08:59:46 downsj Exp $ */ /* * Copyright (c) 1996 Manuel Bouyer. All rights reserved. @@ -60,6 +60,12 @@ #define ACD_DEBUG_PRINT(args) #endif +#ifdef ATAPI_DEBUG +#define ATAPI_DEBUG_PRINT(args) printf args +#else +#define ATAPI_DEBUG_PRINT(args) +#endif + struct acd_softc { struct device sc_dev; struct disk sc_dk; @@ -135,8 +141,6 @@ acdattach(parent, self, aux) struct at_dev_link *sa = aux; struct mode_sense cmd; struct cappage cap; - int print_type = 0; - char *mtype; printf("\n"); @@ -171,70 +175,6 @@ acdattach(parent, self, aux) self->dv_xname); return; } - - /* Determine media type. */ - switch (cap.medium_type) { - case MDT_UNKNOWN: - mtype = "medium type unknown"; - break; - - case MDT_DATA_120: - mtype = "120mm data disc"; - break; - - case MDT_AUDIO_120: - mtype = "120mm audio disc"; - break; - - case MDT_COMB_120: - mtype = "120mm data/audio disc"; - break; - - case MDT_PHOTO_120: - mtype = "120mm photo disc"; - break; - - case MDT_DATA_80: - mtype = "80mm data disc"; - break; - - case MDT_AUDIO_80: - mtype = "80mm audio disc"; - break; - - case MDT_COMB_80: - mtype = "80mm data/audio disc"; - break; - - case MDT_PHOTO_80: - mtype = "80mm photo disc"; - break; - - case MDT_NO_DISC: - mtype = "drive empty"; - break; - - case MDT_DOOR_OPEN: - mtype = "door open"; - break; - - case MDT_FMT_ERROR: - mtype = "medium format error"; - break; - - default: - mtype = "unknown type"; - print_type = 1; - break; - } - - /* - * Display information about the drive. - */ - printf("%s: %s", self->dv_xname, mtype); - if (print_type) - printf(" (type 0x%x)", cap.medium_type); - printf("\n"); } /* @@ -544,9 +484,8 @@ acdstart(acd) * way and let it run (user level wait). */ if (ad_link->flags & ADEV_WAITING) { -#ifdef ATAPI_DEBUG - printf("acdstart: waking up\n"); -#endif + ATAPI_DEBUG_PRINT(("acdstart: waking up\n")); + ad_link->flags &= ~ADEV_WAITING; wakeup((caddr_t)ad_link); return; @@ -1034,9 +973,7 @@ acd_size(cd, flags) */ if (atapi_exec_cmd(cd->ad_link, &cmd , sizeof(cmd), &rdcap, sizeof(rdcap), B_READ, 0) != 0) { -#ifdef ATAPI_DEBUG - printf("ATAPI_READ_CD_CAPACITY failed\n"); -#endif + ATAPI_DEBUG_PRINT(("ATAPI_READ_CD_CAPACITY failed\n")); return 0; } @@ -1049,10 +986,8 @@ acd_size(cd, flags) if (size < 100) size = 400000; /* ditto */ cd->params.disksize = size; -#ifdef ATAPI_DEBUG - printf("acd_size: %ld %ld\n",blksize,size); -#endif + ATAPI_DEBUG_PRINT(("acd_size: %ld %ld\n",blksize,size)); return size; } diff --git a/sys/dev/atapi/atapi.h b/sys/dev/atapi/atapi.h index 20ec1948981..ed82083c528 100644 --- a/sys/dev/atapi/atapi.h +++ b/sys/dev/atapi/atapi.h @@ -1,4 +1,4 @@ -/* $NetBSD: $ */ +/* $OpenBSD: atapi.h,v 1.2 1996/06/09 08:59:48 downsj Exp $ */ /* * Copyright (c) 1996 Manuel Bouyer. All rights reserved. diff --git a/sys/dev/atapi/atapiconf.c b/sys/dev/atapi/atapiconf.c index 85095a4c0a4..cd285c7de6f 100644 --- a/sys/dev/atapi/atapiconf.c +++ b/sys/dev/atapi/atapiconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: $ */ +/* $OpenBSD: atapiconf.c,v 1.2 1996/06/09 08:59:49 downsj Exp $ */ /* * Copyright (c) 1996 Manuel Bouyer. All rights reserved. diff --git a/sys/dev/atapi/atapilink.h b/sys/dev/atapi/atapilink.h index 7d01102a2a7..22a5d880dee 100644 --- a/sys/dev/atapi/atapilink.h +++ b/sys/dev/atapi/atapilink.h @@ -1,4 +1,4 @@ -/* $NetBSD: $ */ +/* $OpenBSD: atapilink.h,v 1.2 1996/06/09 08:59:50 downsj Exp $ */ /* * Copyright (c) 1996 Manuel Bouyer. All rights reserved. diff --git a/sys/dev/atapi/files.atapi b/sys/dev/atapi/files.atapi index 508710c0960..8bd2d24e287 100644 --- a/sys/dev/atapi/files.atapi +++ b/sys/dev/atapi/files.atapi @@ -1,3 +1,4 @@ +# $OpenBSD: files.atapi,v 1.2 1996/06/09 08:59:52 downsj Exp $ # # Config.new file and device description for machine-independent ATAPI code. # Included by ports that need it. Ports that use it must provide diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c index d9061bd00eb..5a1302ee25a 100644 --- a/sys/dev/isa/wd.c +++ b/sys/dev/isa/wd.c @@ -1,3 +1,4 @@ +/* $OpenBSD: wd.c,v 1.16 1996/06/09 08:59:55 downsj Exp $ */ /* $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */ /* diff --git a/sys/dev/isa/wdc.c b/sys/dev/isa/wdc.c index c0e79d93e16..28f67269a06 100644 --- a/sys/dev/isa/wdc.c +++ b/sys/dev/isa/wdc.c @@ -1,3 +1,4 @@ +/* $OpenBSD: wdc.c,v 1.2 1996/06/09 08:59:56 downsj Exp $ */ /* $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */ /* diff --git a/sys/dev/isa/wdlink.h b/sys/dev/isa/wdlink.h index 0a6ba4e6362..8bfdee8ba8a 100644 --- a/sys/dev/isa/wdlink.h +++ b/sys/dev/isa/wdlink.h @@ -1,4 +1,4 @@ -/* $NetBSD: $ */ +/* $OpenBSD: wdlink.h,v 1.2 1996/06/09 08:59:57 downsj Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. diff --git a/sys/dev/isa/wdreg.h b/sys/dev/isa/wdreg.h index ad3bb8bb107..07e54e39f35 100644 --- a/sys/dev/isa/wdreg.h +++ b/sys/dev/isa/wdreg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: wdreg.h,v 1.3 1996/06/09 08:59:58 downsj Exp $ */ /* $NetBSD: wdreg.h,v 1.13 1995/03/29 21:56:46 briggs Exp $ */ /*- |