summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2009-12-06 01:11:45 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2009-12-06 01:11:45 +0000
commit8f64ba9fa040b0adc6b61dfeef17e73d07db6c65 (patch)
tree464ec3b90df1d815a0a343b7aa0a3a5c5b41311a
parent535cd85f4753b457a2f2ca64902621da27a338bb (diff)
whitespace tweaks
-rw-r--r--sys/scsi/cd.c32
1 files changed, 15 insertions, 17 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 51015d3c5f4..b5bc35bca69 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd.c,v 1.151 2009/12/06 01:05:14 dlg Exp $ */
+/* $OpenBSD: cd.c,v 1.152 2009/12/06 01:11:44 dlg Exp $ */
/* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */
/*
@@ -116,13 +116,13 @@ int cd_get_parms(struct cd_softc *, int);
int cd_load_toc(struct cd_softc *, struct cd_toc *, int);
int cd_interpret_sense(struct scsi_xfer *);
-int dvd_auth(struct cd_softc *, union dvd_authinfo *);
-int dvd_read_physical(struct cd_softc *, union dvd_struct *);
-int dvd_read_copyright(struct cd_softc *, union dvd_struct *);
-int dvd_read_disckey(struct cd_softc *, union dvd_struct *);
-int dvd_read_bca(struct cd_softc *, union dvd_struct *);
-int dvd_read_manufact(struct cd_softc *, union dvd_struct *);
-int dvd_read_struct(struct cd_softc *, union dvd_struct *);
+int dvd_auth(struct cd_softc *, union dvd_authinfo *);
+int dvd_read_physical(struct cd_softc *, union dvd_struct *);
+int dvd_read_copyright(struct cd_softc *, union dvd_struct *);
+int dvd_read_disckey(struct cd_softc *, union dvd_struct *);
+int dvd_read_bca(struct cd_softc *, union dvd_struct *);
+int dvd_read_manufact(struct cd_softc *, union dvd_struct *);
+int dvd_read_struct(struct cd_softc *, union dvd_struct *);
void cd_powerhook(int why, void *arg);
@@ -202,7 +202,7 @@ cdattach(struct device *parent, struct device *self, void *aux)
/*
* Initialize and attach the disk structure.
*/
- cd->sc_dk.dk_driver = &cddkdriver;
+ cd->sc_dk.dk_driver = &cddkdriver;
cd->sc_dk.dk_name = cd->sc_dev.dv_xname;
disk_attach(&cd->sc_dk);
@@ -875,8 +875,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
break;
}
error = cd_read_subchannel(cd, args->address_format,
- args->data_format, args->track,
- &data, len);
+ args->data_format, args->track, &data, len);
if (error)
break;
len = min(len, _2btol(data.header.data_len) +
@@ -896,7 +895,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
bcopy(&th, addr, sizeof(th));
break;
}
- case CDIOREADTOCENTRYS: {
+ case CDIOREADTOCENTRYS: {
struct cd_toc *toc;
struct ioc_read_toc_entry *te =
(struct ioc_read_toc_entry *)addr;
@@ -959,8 +958,8 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
toc = malloc(sizeof(*toc), M_TEMP, M_WAITOK | M_ZERO);
error = cd_read_toc(cd, 0, 0, toc,
- sizeof(struct ioc_toc_header) + sizeof(struct cd_toc_entry),
- 0x40 /* control word for "get MS info" */);
+ sizeof(struct ioc_toc_header) + sizeof(struct cd_toc_entry),
+ 0x40 /* control word for "get MS info" */);
if (error) {
free(toc, M_TEMP);
@@ -1330,8 +1329,7 @@ cd_set_pa_immed(struct cd_softc *cd, int flags)
if (audio->flags != oflags) {
if (big)
error = scsi_mode_select_big(cd->sc_link,
- SMS_PF, &data->hdr_big, flags,
- 20000);
+ SMS_PF, &data->hdr_big, flags, 20000);
else
error = scsi_mode_select(cd->sc_link, SMS_PF,
&data->hdr, flags, 20000);
@@ -1923,7 +1921,7 @@ cd_interpret_sense(struct scsi_xfer *xs)
if ((xs->flags & SCSI_IGNORE_NOT_READY) != 0)
return (0);
if (ASC_ASCQ(sense) == SENSE_NOT_READY_BECOMING_READY) {
- SC_DEBUG(sc_link, SDEV_DB1, ("not ready: busy (%#x)\n",
+ SC_DEBUG(sc_link, SDEV_DB1, ("not ready: busy (%#x)\n",
sense->add_sense_code_qual));
/* don't count this as a retry */
xs->retries++;