summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/cdrw/copycd.c4
-rw-r--r--usr/src/cmd/cdrw/dae.c4
-rw-r--r--usr/src/cmd/cdrw/device.c2
-rw-r--r--usr/src/cmd/cdrw/main.c6
-rw-r--r--usr/src/cmd/cdrw/trackio.c8
-rw-r--r--usr/src/cmd/cdrw/trackio.h4
-rw-r--r--usr/src/cmd/cdrw/transport.c7
-rw-r--r--usr/src/cmd/cdrw/util.c6
-rw-r--r--usr/src/cmd/cdrw/util.h4
9 files changed, 24 insertions, 21 deletions
diff --git a/usr/src/cmd/cdrw/copycd.c b/usr/src/cmd/cdrw/copycd.c
index 21bab5c87b..1979cfce9a 100644
--- a/usr/src/cmd/cdrw/copycd.c
+++ b/usr/src/cmd/cdrw/copycd.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -118,7 +118,7 @@ read_data_track(cd_device *dev, struct track_info *ti, bstreamhandle h)
}
blks_read += read_chunk;
cblk += read_chunk;
- (void) progress((void *)(ti->ti_track_size), blks_read);
+ (void) progress((ti->ti_track_size), blks_read);
}
/* l10n_NOTE : 'done' as in "Reading track 1...done" */
(void) str_print(gettext("done.\n"), progress_pos);
diff --git a/usr/src/cmd/cdrw/dae.c b/usr/src/cmd/cdrw/dae.c
index cc02b5ae0b..4a0c059e6f 100644
--- a/usr/src/cmd/cdrw/dae.c
+++ b/usr/src/cmd/cdrw/dae.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -207,7 +207,7 @@ read_audio_track(cd_device *dev, struct track_info *ti, bstreamhandle h)
for (c_blk = start_blk; c_blk < end_blk; c_blk += blocks_to_write) {
/* update progress indicator */
- (void) progress((void *) (end_blk - start_blk),
+ (void) progress((end_blk - start_blk),
(int64_t)(c_blk - start_blk));
blocks_to_read = end_blk - c_blk + blks_to_overlap;
diff --git a/usr/src/cmd/cdrw/device.c b/usr/src/cmd/cdrw/device.c
index a7edbe5bac..f01603bdcb 100644
--- a/usr/src/cmd/cdrw/device.c
+++ b/usr/src/cmd/cdrw/device.c
@@ -714,7 +714,7 @@ write_next_track(int mode, bstreamhandle h)
print_n_flush(gettext("Writing track %d..."), (int)ti->ti_track_no);
init_progress();
- if (!write_track(target, ti, h, progress, (void *)size, te)) {
+ if (!write_track(target, ti, h, progress, size, te)) {
if (te->err_type == TRACKIO_ERR_USER_ABORT) {
(void) str_print(gettext("Aborted.\n"), progress_pos);
} else {
diff --git a/usr/src/cmd/cdrw/main.c b/usr/src/cmd/cdrw/main.c
index d10cb1a54b..b28b07064f 100644
--- a/usr/src/cmd/cdrw/main.c
+++ b/usr/src/cmd/cdrw/main.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -128,7 +128,7 @@ setup_target(int flag)
return (scan_for_cd_device(flag, &target));
}
-void
+int
main(int argc, char **argv)
{
int c;
@@ -395,5 +395,5 @@ main(int argc, char **argv)
(void) printf(gettext("done.\n"));
exit(0);
}
-
+ return (0);
}
diff --git a/usr/src/cmd/cdrw/trackio.c b/usr/src/cmd/cdrw/trackio.c
index 017cc45e14..7a3a541850 100644
--- a/usr/src/cmd/cdrw/trackio.c
+++ b/usr/src/cmd/cdrw/trackio.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -63,8 +63,8 @@ static mutex_t pcb_mutex;
static cond_t pcb_cond;
static uchar_t pcb_user_abort, pcb_done, pcb_synch_initialized;
static uint_t pcb_completed_io_size;
-static int (*pcb_cb)(void *, int64_t);
-static void *pcb_arg;
+static int (*pcb_cb)(int64_t, int64_t);
+static int64_t pcb_arg;
static void
fini_tio_data(void)
@@ -259,7 +259,7 @@ trackio_sig_handler(int i)
int
write_track(cd_device *dev, struct track_info *ti, bstreamhandle h,
- int (*cb)(void *, int64_t), void *arg, struct trackio_error *te)
+ int (*cb)(int64_t, int64_t), int64_t arg, struct trackio_error *te)
{
int blksize, i, sz_read, rem;
uint32_t start_b;
diff --git a/usr/src/cmd/cdrw/trackio.h b/usr/src/cmd/cdrw/trackio.h
index 611d2f8d17..29c374b0b5 100644
--- a/usr/src/cmd/cdrw/trackio.h
+++ b/usr/src/cmd/cdrw/trackio.h
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -76,7 +76,7 @@ struct iobuf {
#define AUDIO_TRACK_BLKSIZE 2352
int write_track(cd_device *dev, struct track_info *ti, bstreamhandle h,
- int (*cb)(void *, int64_t), void *arg, struct
+ int (*cb)(int64_t, int64_t), int64_t arg, struct
trackio_error *te);
#ifdef __cplusplus
diff --git a/usr/src/cmd/cdrw/transport.c b/usr/src/cmd/cdrw/transport.c
index 1f479eb74c..56366c34be 100644
--- a/usr/src/cmd/cdrw/transport.c
+++ b/usr/src/cmd/cdrw/transport.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -83,7 +83,10 @@ uscsi(int fd, struct uscsi_cmd *scmd)
max_retries = 500;
} else {
- max_retries = 20;
+ /*
+ * Pioneer A08/A09 retries approx 30 times.
+ */
+ max_retries = 40;
}
/*
diff --git a/usr/src/cmd/cdrw/util.c b/usr/src/cmd/cdrw/util.c
index 416552d3c9..57eadb3c8d 100644
--- a/usr/src/cmd/cdrw/util.c
+++ b/usr/src/cmd/cdrw/util.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -192,10 +192,10 @@ init_progress(void)
}
int
-progress(void *arg, int64_t completed)
+progress(int64_t arg, int64_t completed)
{
char s[BUFSIZE];
- uint64_t total = (uintptr_t)arg & 0xffffffff;
+ uint64_t total = (uint64_t)arg & 0xffffffff;
if (completed == -1) {
/* Got ^C. Add 2 to progress pos to compensate for ^ and C */
progress_pos = str_print("(flushing ...)", progress_pos+2);
diff --git a/usr/src/cmd/cdrw/util.h b/usr/src/cmd/cdrw/util.h
index daa24c024c..c914de62c2 100644
--- a/usr/src/cmd/cdrw/util.h
+++ b/usr/src/cmd/cdrw/util.h
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -69,7 +69,7 @@ void print_trackio_error(struct trackio_error *te);
char *get_err_str(void);
int get_audio_type(char *ext);
void init_progress(void);
-int progress(void *arg, int64_t completed);
+int progress(int64_t arg, int64_t completed);
void raise_priv(void);
void lower_priv(void);
int check_auth(uid_t uid);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-28 11:51:49 +0000