[Debburn-changes] r430 - in cdrkit/trunk: . cdda2wav doc/READMEs
include libhfs_iso libparanoia libschily libunls libusal
libusal/scg mkisofs mkisofs/diag readcd rscsi wodim
Eduard Bloch
blade at alioth.debian.org
Thu Nov 23 19:57:31 CET 2006
Author: blade
Date: 2006-11-23 19:57:28 +0100 (Thu, 23 Nov 2006)
New Revision: 430
Added:
cdrkit/trunk/libusal/
Removed:
cdrkit/trunk/libscg/
Modified:
cdrkit/trunk/ABOUT
cdrkit/trunk/CMakeLists.txt
cdrkit/trunk/cdda2wav/CMakeLists.txt
cdrkit/trunk/cdda2wav/Changelog
cdrkit/trunk/cdda2wav/cdda2wav.c
cdrkit/trunk/cdda2wav/interface.c
cdrkit/trunk/cdda2wav/interface.h
cdrkit/trunk/cdda2wav/ioctl.c
cdrkit/trunk/cdda2wav/resample.c
cdrkit/trunk/cdda2wav/ringbuff.c
cdrkit/trunk/cdda2wav/scsi_cmds.c
cdrkit/trunk/cdda2wav/scsi_cmds.h
cdrkit/trunk/cdda2wav/semshm.c
cdrkit/trunk/cdda2wav/toc.c
cdrkit/trunk/doc/READMEs/README.cdplus
cdrkit/trunk/include/AddScgBits.cmake
cdrkit/trunk/libhfs_iso/libhfs_iso.com
cdrkit/trunk/libparanoia/README.interface
cdrkit/trunk/libschily/libschily.com
cdrkit/trunk/libunls/libunls.com
cdrkit/trunk/libusal/CMakeLists.txt
cdrkit/trunk/libusal/Targets
cdrkit/trunk/libusal/libscg-mapvers
cdrkit/trunk/libusal/libscg.com
cdrkit/trunk/libusal/libscg.mk
cdrkit/trunk/libusal/rdummy.c
cdrkit/trunk/libusal/scg/scgcmd.h
cdrkit/trunk/libusal/scg/scgio.h
cdrkit/trunk/libusal/scg/scgops.h
cdrkit/trunk/libusal/scg/scsitransp.h
cdrkit/trunk/libusal/scgsettarget.c
cdrkit/trunk/libusal/scgtimes.c
cdrkit/trunk/libusal/scgtimes.h
cdrkit/trunk/libusal/scsi-aix.c
cdrkit/trunk/libusal/scsi-amigaos.c
cdrkit/trunk/libusal/scsi-apollo.c
cdrkit/trunk/libusal/scsi-beos.c
cdrkit/trunk/libusal/scsi-bsd-os.c
cdrkit/trunk/libusal/scsi-bsd.c
cdrkit/trunk/libusal/scsi-dos.c
cdrkit/trunk/libusal/scsi-hpux.c
cdrkit/trunk/libusal/scsi-linux-ata.c
cdrkit/trunk/libusal/scsi-linux-pg.c
cdrkit/trunk/libusal/scsi-linux-sg.c
cdrkit/trunk/libusal/scsi-mac-iokit.c
cdrkit/trunk/libusal/scsi-next.c
cdrkit/trunk/libusal/scsi-openserver.c
cdrkit/trunk/libusal/scsi-os2.c
cdrkit/trunk/libusal/scsi-osf.c
cdrkit/trunk/libusal/scsi-qnx.c
cdrkit/trunk/libusal/scsi-remote.c
cdrkit/trunk/libusal/scsi-sgi.c
cdrkit/trunk/libusal/scsi-sun.c
cdrkit/trunk/libusal/scsi-unixware.c
cdrkit/trunk/libusal/scsi-vms.c
cdrkit/trunk/libusal/scsi-wnt.c
cdrkit/trunk/libusal/scsierrs.c
cdrkit/trunk/libusal/scsihack.c
cdrkit/trunk/libusal/scsihelp.c
cdrkit/trunk/libusal/scsiopen.c
cdrkit/trunk/libusal/scsitransp.c
cdrkit/trunk/mkisofs/CMakeLists.txt
cdrkit/trunk/mkisofs/ChangeLog
cdrkit/trunk/mkisofs/diag/dump.mk
cdrkit/trunk/mkisofs/diag/isodebug.8
cdrkit/trunk/mkisofs/diag/isodebug.mk
cdrkit/trunk/mkisofs/diag/isodump.mk
cdrkit/trunk/mkisofs/diag/isoinfo.8
cdrkit/trunk/mkisofs/diag/isoinfo.mk
cdrkit/trunk/mkisofs/diag/isovfy.mk
cdrkit/trunk/mkisofs/more.mapping
cdrkit/trunk/mkisofs/scsi.c
cdrkit/trunk/readcd/CMakeLists.txt
cdrkit/trunk/readcd/readcd.1
cdrkit/trunk/readcd/readcd.c
cdrkit/trunk/rscsi/CMakeLists.txt
cdrkit/trunk/rscsi/rscsi.c
cdrkit/trunk/wodim/CMakeLists.txt
cdrkit/trunk/wodim/audiosize.c
cdrkit/trunk/wodim/cdr_drv.c
cdrkit/trunk/wodim/cdtext.c
cdrkit/trunk/wodim/clone.c
cdrkit/trunk/wodim/drv_7501.c
cdrkit/trunk/wodim/drv_jvc.c
cdrkit/trunk/wodim/drv_mmc.c
cdrkit/trunk/wodim/drv_philips.c
cdrkit/trunk/wodim/drv_simul.c
cdrkit/trunk/wodim/drv_sony.c
cdrkit/trunk/wodim/modes.c
cdrkit/trunk/wodim/scsi_cdr.c
cdrkit/trunk/wodim/scsi_cdr_mmc4.c
cdrkit/trunk/wodim/scsi_mmc.c
cdrkit/trunk/wodim/scsi_mmc4.c
cdrkit/trunk/wodim/scsi_scan.c
cdrkit/trunk/wodim/scsi_scan.h
cdrkit/trunk/wodim/subchan.c
cdrkit/trunk/wodim/wm_packet.c
cdrkit/trunk/wodim/wm_session.c
cdrkit/trunk/wodim/wodim.1
cdrkit/trunk/wodim/wodim.c
cdrkit/trunk/wodim/wodim.h
Log:
Crash and burn, big renaming action, part I
Modified: cdrkit/trunk/ABOUT
===================================================================
--- cdrkit/trunk/ABOUT 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/ABOUT 2006-11-23 18:57:28 UTC (rev 430)
@@ -46,15 +46,15 @@
- isovfy verify an ISO-9660 image
-- readcd (a stripped down version of scgskeleton)
+- readcd (a stripped down version of usalskeleton)
By Jörg Schilling schilling at fokus.fhg.de and
may be used to read data CD's, to write to DVD-RAM
and to copy Solaris boot CD's
-- scgcheck (a program to validate the correct behavior
+- usalcheck (a program to validate the correct behavior
By Jörg Schilling schilling at fokus.fhg.de and
- of the low level libscg code and the SCSI transport
+ of the low level libusal code and the SCSI transport
code of the underlying OS).
-- libscg (a highly portable SCSI transport library)
+- libusal (a highly portable SCSI transport library)
By Jörg Schilling schilling at fokus.fhg.de
Modified: cdrkit/trunk/CMakeLists.txt
===================================================================
--- cdrkit/trunk/CMakeLists.txt 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/CMakeLists.txt 2006-11-23 18:57:28 UTC (rev 430)
@@ -1,3 +1,3 @@
PROJECT (cdrkit)
-SUBDIRS(cdda2wav wodim libdeflt libedc libhfs_iso libparanoia libscg libschily libunls mkisofs readcd rscsi 3rd-party/dirsplit include)
+SUBDIRS(cdda2wav wodim libdeflt libedc libhfs_iso libparanoia libusal libschily libunls mkisofs readcd rscsi 3rd-party/dirsplit include)
Modified: cdrkit/trunk/cdda2wav/CMakeLists.txt
===================================================================
--- cdrkit/trunk/cdda2wav/CMakeLists.txt 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/cdda2wav/CMakeLists.txt 2006-11-23 18:57:28 UTC (rev 430)
@@ -17,7 +17,7 @@
LIST(APPEND EXTRA_LIBS winmm)
ENDIF (WIN32)
-LINK_DIRECTORIES(../libschily ../libscg ../libdeflt ../libparanoia)
+LINK_DIRECTORIES(../libschily ../libusal ../libdeflt ../libparanoia)
ADD_EXECUTABLE (cdda2wav aifc.c aiff.c base64.c cd_misc.c cdda2wav.c defaults.c getnum.c interface.c ioctl.c md5c.c modes.c raw.c resample.c ringbuff.c scsi_cdr.c scsi_cmds.c scsi_scan.c semshm.c setuid.c sha_func.c sndconfig.c sun.c toc.c wav.c)
TARGET_LINK_LIBRARIES(cdda2wav ${EXTRA_LIBS})
SET_TARGET_PROPERTIES(cdda2wav PROPERTIES SKIP_BUILD_RPATH TRUE)
Modified: cdrkit/trunk/cdda2wav/Changelog
===================================================================
--- cdrkit/trunk/cdda2wav/Changelog 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/cdda2wav/Changelog 2006-11-23 18:57:28 UTC (rev 430)
@@ -158,7 +158,7 @@
interface change: ReadCdrom and ReadCdromData return number of read sectors
schily include file added
default buffer size set to 8 sectors for ide on Linux
- suppress errors when scgp->silent > 0
+ suppress errors when usalp->silent > 0
Fri Jun 2 07:39:55 2000 Heiko Eissfeldt <heiko at colossus.escape.de>
* ringbuff.c 1.4
Modified: cdrkit/trunk/cdda2wav/cdda2wav.c
===================================================================
--- cdrkit/trunk/cdda2wav/cdda2wav.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/cdda2wav/cdda2wav.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -106,7 +106,7 @@
#endif
#include <vadefs.h>
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
#ifdef HAVE_AREAS
#include <be/kernel/OS.h>
@@ -632,16 +632,16 @@
#include "scsi_cmds.h"
-static int RealEnd(SCSI *scgp, UINT4 *buff);
+static int RealEnd(SCSI *usalp, UINT4 *buff);
-static int RealEnd(SCSI *scgp, UINT4 *buff)
+static int RealEnd(SCSI *usalp, UINT4 *buff)
{
- if (scg_cmd_err(scgp) != 0) {
+ if (usal_cmd_err(usalp) != 0) {
int c,k,q;
- k = scg_sense_key(scgp);
- c = scg_sense_code(scgp);
- q = scg_sense_qual(scgp);
+ k = usal_sense_key(usalp);
+ c = usal_sense_code(usalp);
+ q = usal_sense_qual(usalp);
if ((k == 0x05 /* ILLEGAL_REQUEST */ &&
c == 0x21 /* lba out of range */ &&
q == 0x00) ||
@@ -655,7 +655,7 @@
}
}
- if (scg_getresid(scgp) > 16) return 1;
+ if (usal_getresid(usalp) > 16) return 1;
{
unsigned char *p;
@@ -1056,10 +1056,10 @@
#endif
if (child_pid != 0) {
- SCSI *scgp = get_scsi_p();
- if (scgp->running) {
- scgp->cb_fun = on_exitscsi;
- scgp->cb_arg = (void *)status;
+ SCSI *usalp = get_scsi_p();
+ if (usalp->running) {
+ usalp->cb_fun = on_exitscsi;
+ usalp->cb_arg = (void *)status;
} else {
on_exitscsi((void *)status);
}
@@ -1365,7 +1365,7 @@
retry_count = 0;
do {
- SCSI *scgp = get_scsi_p();
+ SCSI *usalp = get_scsi_p();
int retval;
#ifdef DEBUG_READS
fprintf(stderr, "reading from %lu to %lu, overlap %u\n", lSector, lSector + SectorBurst -1, global.overlap);
@@ -1384,17 +1384,17 @@
/* we switch to single sector reads,
* in order to handle the remaining sectors. */
- scgp->silent++;
+ usalp->silent++;
do {
- int retval2 = ReadCdRomSub( scgp, bufferSub, lSector+singles, 1 );
- *eorecording = RealEnd( scgp, bufferSub );
+ int retval2 = ReadCdRomSub( usalp, bufferSub, lSector+singles, 1 );
+ *eorecording = RealEnd( usalp, bufferSub );
if (*eorecording) {
break;
}
memcpy(p->data+singles*CD_FRAMESAMPLES, bufferSub, CD_FRAMESIZE_RAW);
singles++;
} while (singles < SectorBurst);
- scgp->silent--;
+ usalp->silent--;
if ( *eorecording ) {
patch_real_end(lSector+singles);
@@ -1413,7 +1413,7 @@
}
} else {
- retval = ReadCdRom( scgp, p->data, lSector, SectorBurst );
+ retval = ReadCdRom( usalp, p->data, lSector, SectorBurst );
}
handle_inputendianess(p->data, SectorBurst * CD_FRAMESAMPLES);
if (NULL ==
Modified: cdrkit/trunk/cdda2wav/interface.c
===================================================================
--- cdrkit/trunk/cdda2wav/interface.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/cdda2wav/interface.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -76,7 +76,7 @@
# endif
#endif
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
#include "mytype.h"
#include "byteorder.h"
@@ -104,21 +104,21 @@
void priv_off(void);
void (*EnableCdda)(SCSI *, int Switch, unsigned uSectorsize);
-unsigned (*doReadToc)(SCSI *scgp);
-void (*ReadTocText)(SCSI *scgp);
-unsigned (*ReadLastAudio)(SCSI *scgp);
-int (*ReadCdRom)(SCSI *scgp, UINT4 *p, unsigned lSector,
+unsigned (*doReadToc)(SCSI *usalp);
+void (*ReadTocText)(SCSI *usalp);
+unsigned (*ReadLastAudio)(SCSI *usalp);
+int (*ReadCdRom)(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal);
-int (*ReadCdRomData)(SCSI *scgp, unsigned char *p, unsigned lSector,
+int (*ReadCdRomData)(SCSI *usalp, unsigned char *p, unsigned lSector,
unsigned SectorBurstVal);
-int (*ReadCdRomSub)(SCSI *scgp, UINT4 *p, unsigned lSector,
+int (*ReadCdRomSub)(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal);
-subq_chnl *(*ReadSubChannels)(SCSI *scgp, unsigned lSector);
-subq_chnl *(*ReadSubQ)(SCSI *scgp, unsigned char sq_format,
+subq_chnl *(*ReadSubChannels)(SCSI *usalp, unsigned lSector);
+subq_chnl *(*ReadSubQ)(SCSI *usalp, unsigned char sq_format,
unsigned char track);
-void (*SelectSpeed)(SCSI *scgp, unsigned speed);
-int (*Play_at)(SCSI *scgp, unsigned int from_sector, unsigned int sectors);
-int (*StopPlay)(SCSI *scgp);
+void (*SelectSpeed)(SCSI *usalp, unsigned speed);
+int (*Play_at)(SCSI *usalp, unsigned int from_sector, unsigned int sectors);
+int (*StopPlay)(SCSI *usalp);
void (*trash_cache)(UINT4 *p, unsigned lSector, unsigned SectorBurstVal);
#if defined USE_PARANOIA
@@ -163,13 +163,13 @@
{
}
-static SCSI *scgp;
+static SCSI *usalp;
SCSI *get_scsi_p(void);
SCSI *get_scsi_p()
{
- return scgp;
+ return usalp;
}
#if !defined(SIM_CD)
@@ -204,10 +204,10 @@
}
/* do a test unit ready to 'init' the device. */
- TestForMedium(scgp);
+ TestForMedium(usalp);
/* check for the correct type of unit. */
- p = Inquiry(scgp);
+ p = Inquiry(usalp);
#undef TYPE_ROM
#define TYPE_ROM 5
@@ -266,14 +266,14 @@
{
int mmc_code;
- scgp->silent ++;
- allow_atapi(scgp, 1);
+ usalp->silent ++;
+ allow_atapi(usalp, 1);
if (*p == TYPE_ROM) {
- mmc_code = heiko_mmc(scgp);
+ mmc_code = heiko_mmc(usalp);
} else {
mmc_code = 0;
}
- scgp->silent --;
+ usalp->silent --;
/* Exceptions for drives that report incorrect MMC capability */
if (mmc_code != 0) {
@@ -407,12 +407,12 @@
/* look if caddy is loaded */
if (interface == GENERIC_SCSI) {
- scgp->silent++;
- while (!wait_unit_ready(scgp, 60)) {
+ usalp->silent++;
+ while (!wait_unit_ready(usalp, 60)) {
fprintf(stderr,"load cdrom please and press enter");
getchar();
}
- scgp->silent--;
+ usalp->silent--;
}
}
@@ -427,16 +427,16 @@
unsigned char *p = NULL;
char errstr[80];
- dev = scg_open(pdev_name, errstr, sizeof(errstr), 0, 0);
+ dev = usal_open(pdev_name, errstr, sizeof(errstr), 0, 0);
if (NULL == dev)
return EINVAL;
p = Inquiry(dev);
if (p)
{
- scg_close(dev);
+ usal_close(dev);
return 0;
}
- scg_close(dev);
+ usal_close(dev);
return EINVAL;
}
#endif
@@ -605,22 +605,22 @@
needroot(0);
needgroup(0);
/*
- * Call scg_remote() to force loading the remote SCSI transport library
- * code that is located in librscg instead of the dummy remote routines
- * that are located inside libscg.
+ * Call usal_remote() to force loading the remote SCSI transport library
+ * code that is located in librusal instead of the dummy remote routines
+ * that are located inside libusal.
*/
- scg_remote();
+ usal_remote();
if (pdev_name != NULL &&
((strncmp(pdev_name, "HELP", 4) == 0) ||
(strncmp(pdev_name, "help", 4) == 0))) {
- scg_help(stderr);
+ usal_help(stderr);
exit(NO_ERROR);
}
/* device name, debug, verboseopen */
- scgp = scg_open(pdev_name, errstr, sizeof(errstr), 0, 0);
+ usalp = usal_open(pdev_name, errstr, sizeof(errstr), 0, 0);
- if (scgp == NULL) {
+ if (usalp == NULL) {
int err = geterrno();
errmsgno(err, "%s%sCannot open SCSI driver.\n", errstr, errstr[0]?". ":"");
@@ -630,7 +630,7 @@
dontneedgroup();
dontneedroot();
#if defined(sun) || defined(__sun)
- fprintf(stderr, "On SunOS/Solaris make sure you have Joerg Schillings scg SCSI driver installed.\n");
+ fprintf(stderr, "On SunOS/Solaris make sure you have Joerg Schillings usal SCSI driver installed.\n");
#endif
#if defined (__linux__)
fprintf(stderr, "Use the script scan_scsi.linux to find out more.\n");
@@ -641,13 +641,13 @@
fprintf(stderr, "For possible transport specifiers try 'cdda2wav dev=help'.\n");
exit(SYNTAX_ERROR);
}
- scg_settimeout(scgp, 300);
- scg_settimeout(scgp, 60);
- scgp->silent = global.scsi_silent;
- scgp->verbose = global.scsi_verbose;
+ usal_settimeout(usalp, 300);
+ usal_settimeout(usalp, 60);
+ usalp->silent = global.scsi_silent;
+ usalp->verbose = global.scsi_verbose;
- if (global.nsectors > (unsigned) scg_bufsize(scgp, 3*1024*1024)/CD_FRAMESIZE_RAW)
- global.nsectors = scg_bufsize(scgp, 3*1024*1024)/CD_FRAMESIZE_RAW;
+ if (global.nsectors > (unsigned) usal_bufsize(usalp, 3*1024*1024)/CD_FRAMESIZE_RAW)
+ global.nsectors = usal_bufsize(usalp, 3*1024*1024)/CD_FRAMESIZE_RAW;
if (global.overlap >= global.nsectors)
global.overlap = global.nsectors-1;
@@ -656,13 +656,13 @@
* and require root privileges or limit RLIMIT_MEMLOCK infinity
* in order to get a SCSI buffer in case we did call mlockall(MCL_FUTURE).
*/
- init_scsibuf(scgp, global.nsectors*CD_FRAMESIZE_RAW);
+ init_scsibuf(usalp, global.nsectors*CD_FRAMESIZE_RAW);
priv_off();
dontneedgroup();
dontneedroot();
if (global.scanbus) {
- select_target(scgp, stdout);
+ select_target(usalp, stdout);
exit(0);
}
} else {
@@ -702,8 +702,8 @@
* We do this more than once as it is impossible to understand where
* the right place would be to do this....
*/
- if (scgp != NULL) {
- scgp->verbose = global.scsi_verbose;
+ if (usalp != NULL) {
+ usalp->verbose = global.scsi_verbose;
}
}
return retval;
@@ -855,12 +855,12 @@
}
-static subq_chnl *ReadSubQ_sim(SCSI *scgp, unsigned char sq_format,
+static subq_chnl *ReadSubQ_sim(SCSI *usalp, unsigned char sq_format,
unsigned char track);
/* request sub-q-channel information. This function may cause confusion
* for a drive, when called in the sampling process.
*/
-static subq_chnl *ReadSubQ_sim(SCSI *scgp, unsigned char sq_format,
+static subq_chnl *ReadSubQ_sim(SCSI *usalp, unsigned char sq_format,
unsigned char track)
{
subq_chnl *SQp = (subq_chnl *) (SubQbuffer);
@@ -954,11 +954,11 @@
}
#if defined SIM_CD
- scgp = malloc(sizeof(* scgp));
- if (scgp == NULL) {
+ usalp = malloc(sizeof(* usalp));
+ if (usalp == NULL) {
FatalError("No memory for SCSI structure.\n");
}
- scgp->silent = 0;
+ usalp->silent = 0;
SetupSimCd();
#else
/* if drive is of type scsi, get vendor name */
@@ -966,9 +966,9 @@
unsigned sector_size;
SetupSCSI();
- sector_size = get_orig_sectorsize(scgp, &orgmode4, &orgmode10, &orgmode11);
- if (!SCSI_emulated_ATAPI_on(scgp)) {
- if ( sector_size != 2048 && set_sectorsize(scgp, 2048) ) {
+ sector_size = get_orig_sectorsize(usalp, &orgmode4, &orgmode10, &orgmode11);
+ if (!SCSI_emulated_ATAPI_on(usalp)) {
+ if ( sector_size != 2048 && set_sectorsize(usalp, 2048) ) {
fprintf( stderr, "Could not change sector size from %d to 2048\n", sector_size );
}
} else {
@@ -981,11 +981,11 @@
} else {
#if defined (HAVE_IOCTL_INTERFACE)
- scgp = malloc(sizeof(* scgp));
- if (scgp == NULL) {
+ usalp = malloc(sizeof(* usalp));
+ if (usalp == NULL) {
FatalError("No memory for SCSI structure.\n");
}
- scgp->silent = 0;
+ usalp->silent = 0;
SetupCookedIoctl( global.dev_name );
#else
FatalError("Sorry, there is no known method to access the device.\n");
@@ -997,8 +997,8 @@
* We do this more than once as it is impossible to understand where
* the right place would be to do this....
*/
- if (scgp != NULL) {
- scgp->verbose = global.scsi_verbose;
+ if (usalp != NULL) {
+ usalp->verbose = global.scsi_verbose;
}
}
Modified: cdrkit/trunk/cdda2wav/interface.h
===================================================================
--- cdrkit/trunk/cdda2wav/interface.h 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/cdda2wav/interface.h 2006-11-23 18:57:28 UTC (rev 430)
@@ -102,22 +102,22 @@
struct TOC;
/* cdrom access function pointer */
-extern void (*EnableCdda)(SCSI *scgp, int Switch, unsigned uSectorsize);
-extern unsigned (*doReadToc)(SCSI *scgp);
-extern void (*ReadTocText)(SCSI *scgp);
-extern unsigned (*ReadLastAudio)(SCSI *scgp);
-extern int (*ReadCdRom)(SCSI *scgp, UINT4 *p, unsigned lSector,
+extern void (*EnableCdda)(SCSI *usalp, int Switch, unsigned uSectorsize);
+extern unsigned (*doReadToc)(SCSI *usalp);
+extern void (*ReadTocText)(SCSI *usalp);
+extern unsigned (*ReadLastAudio)(SCSI *usalp);
+extern int (*ReadCdRom)(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal);
-extern int (*ReadCdRomSub)(SCSI *scgp, UINT4 *p, unsigned lSector,
+extern int (*ReadCdRomSub)(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal);
-extern int (*ReadCdRomData)(SCSI *scgp, unsigned char *p, unsigned lSector,
+extern int (*ReadCdRomData)(SCSI *usalp, unsigned char *p, unsigned lSector,
unsigned SectorBurstVal);
-extern subq_chnl *(*ReadSubQ)(SCSI *scgp, unsigned char sq_format,
+extern subq_chnl *(*ReadSubQ)(SCSI *usalp, unsigned char sq_format,
unsigned char track);
-extern subq_chnl *(*ReadSubChannels)(SCSI *scgp, unsigned lSector);
-extern void (*SelectSpeed)(SCSI *scgp, unsigned speed);
-extern int (*Play_at)(SCSI *scgp, unsigned from_sector, unsigned sectors);
-extern int (*StopPlay)(SCSI *scgp);
+extern subq_chnl *(*ReadSubChannels)(SCSI *usalp, unsigned lSector);
+extern void (*SelectSpeed)(SCSI *usalp, unsigned speed);
+extern int (*Play_at)(SCSI *usalp, unsigned from_sector, unsigned sectors);
+extern int (*StopPlay)(SCSI *usalp);
extern void (*trash_cache)(UINT4 *p, unsigned lSector, unsigned SectorBurstVal);
SCSI *get_scsi_p(void);
Modified: cdrkit/trunk/cdda2wav/ioctl.c
===================================================================
--- cdrkit/trunk/cdda2wav/ioctl.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/cdda2wav/ioctl.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -41,7 +41,7 @@
#include <schily.h>
#include <device.h>
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
#include "mycdrom.h"
#include "lowlevel.h"
@@ -81,12 +81,12 @@
static int err;
-static void EnableCdda_cooked(SCSI *scgp, int fAudioMode, unsigned uSectorsize);
+static void EnableCdda_cooked(SCSI *usalp, int fAudioMode, unsigned uSectorsize);
/* ARGSUSED */
-static void EnableCdda_cooked(SCSI *scgp, int fAudioMode, unsigned uSectorsize)
+static void EnableCdda_cooked(SCSI *usalp, int fAudioMode, unsigned uSectorsize)
{
#if (defined(__FreeBSD__) && __FreeBSD_version >= 400014) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
- if (scgp && scgp->verbose)
+ if (usalp && usalp->verbose)
fprintf(stderr, "EnableCdda_cooked (CDRIOCSETBLOCKSIZE)...\n");
if (fAudioMode) {
@@ -97,7 +97,7 @@
ioctl(global.cooked_fd, CDRIOCSETBLOCKSIZE, §or_size);
#else
#if defined CDIOCSETCDDA
- if (scgp && scgp->verbose) {
+ if (usalp && usalp->verbose) {
fprintf(stderr, "EnableCdda_cooked (CDIOCSETCDDA)...\n");
if (uSectorsize != CD_FRAMESIZE_RAW)
fprintf(stderr, "non audio sector size is ignored.\n");
Modified: cdrkit/trunk/cdda2wav/resample.c
===================================================================
--- cdrkit/trunk/cdda2wav/resample.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/cdda2wav/resample.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -44,7 +44,7 @@
#include <assert.h>
#include <math.h>
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
#include "mytype.h"
#include "cdda2wav.h"
Modified: cdrkit/trunk/cdda2wav/ringbuff.c
===================================================================
--- cdrkit/trunk/cdda2wav/ringbuff.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/cdda2wav/ringbuff.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -28,7 +28,7 @@
#include <sys/sem.h>
#endif
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
#include "mytype.h"
#include "global.h"
Modified: cdrkit/trunk/cdda2wav/scsi_cmds.c
===================================================================
--- cdrkit/trunk/cdda2wav/scsi_cmds.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/cdda2wav/scsi_cmds.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -37,11 +37,11 @@
(cdb)->count[2] = (len) & 0xFF)
-#include <scg/scgcmd.h>
-#include <scg/scsidefs.h>
-#include <scg/scsireg.h>
+#include <usal/usalcmd.h>
+#include <usal/scsidefs.h>
+#include <usal/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
#include "mytype.h"
#include "cdda2wav.h"
@@ -57,21 +57,21 @@
subq_chnl *SubQbuffer;
unsigned char *cmd;
-static unsigned ReadFullTOCSony(SCSI *scgp);
-static unsigned ReadFullTOCMMC(SCSI *scgp);
+static unsigned ReadFullTOCSony(SCSI *usalp);
+static unsigned ReadFullTOCMMC(SCSI *usalp);
-int SCSI_emulated_ATAPI_on(SCSI *scgp)
+int SCSI_emulated_ATAPI_on(SCSI *usalp)
{
/* return is_atapi;*/
- if (scg_isatapi(scgp) > 0)
+ if (usal_isatapi(usalp) > 0)
return (TRUE);
- (void) allow_atapi(scgp, TRUE);
- return (allow_atapi(scgp, TRUE));
+ (void) allow_atapi(usalp, TRUE);
+ return (allow_atapi(usalp, TRUE));
}
-int heiko_mmc(SCSI *scgp)
+int heiko_mmc(SCSI *usalp)
{
unsigned char mode[0x100];
int was_atapi;
@@ -80,11 +80,11 @@
fillbytes((caddr_t)mode, sizeof(mode), '\0');
- was_atapi = allow_atapi(scgp, 1);
- scgp->silent++;
- mp = mmc_cap(scgp, mode);
- scgp->silent--;
- allow_atapi(scgp, was_atapi);
+ was_atapi = allow_atapi(usalp, 1);
+ usalp->silent++;
+ mp = mmc_cap(usalp, mode);
+ usalp->silent--;
+ allow_atapi(usalp, was_atapi);
if (mp == NULL)
return (0);
@@ -105,7 +105,7 @@
/* get current sector size from SCSI cdrom drive */
unsigned int
-get_orig_sectorsize(SCSI *scgp, unsigned char *m4, unsigned char *m10,
+get_orig_sectorsize(SCSI *usalp, unsigned char *m4, unsigned char *m10,
unsigned char *m11)
{
/* first get current values for density, etc. */
@@ -121,8 +121,8 @@
}
/* do the scsi cmd */
- if (scgp->verbose) fprintf(stderr, "\nget density and sector size...");
- if (mode_sense(scgp, modesense, 12, 0x01, 0) < 0)
+ if (usalp->verbose) fprintf(stderr, "\nget density and sector size...");
+ if (mode_sense(usalp, modesense, 12, 0x01, 0) < 0)
fprintf(stderr, "get_orig_sectorsize mode sense failed\n");
/* FIXME: some drives dont deliver block descriptors !!! */
@@ -148,13 +148,13 @@
/* switch CDROM scsi drives to given sector size */
-int set_sectorsize(SCSI *scgp, unsigned int secsize)
+int set_sectorsize(SCSI *usalp, unsigned int secsize)
{
static unsigned char mode [4 + 8];
int retval;
if (orgmode4 == 0xff) {
- get_orig_sectorsize(scgp, &orgmode4, &orgmode10, &orgmode11);
+ get_orig_sectorsize(usalp, &orgmode4, &orgmode10, &orgmode11);
}
if (orgmode4 == 0x82 && secsize == 2048)
orgmode4 = 0x81;
@@ -167,9 +167,9 @@
mode[10] = secsize >> 8; /* block length "msb" */
mode[11] = secsize & 0xFF; /* block length lsb */
- if (scgp->verbose) fprintf(stderr, "\nset density and sector size...");
+ if (usalp->verbose) fprintf(stderr, "\nset density and sector size...");
/* do the scsi cmd */
- if ((retval = mode_select(scgp, mode, 12, 0, scgp->inq->data_format >= 2)) < 0)
+ if ((retval = mode_select(usalp, mode, 12, 0, usalp->inq->data_format >= 2)) < 0)
fprintf (stderr, "setting sector size failed\n");
return retval;
@@ -177,7 +177,7 @@
/* switch Toshiba/DEC and HP drives from/to cdda density */
-void EnableCddaModeSelect(SCSI *scgp, int fAudioMode, unsigned uSectorsize)
+void EnableCddaModeSelect(SCSI *usalp, int fAudioMode, unsigned uSectorsize)
{
/* reserved, Medium type=0, Dev spec Parm = 0, block descriptor len 0 oder 8,
Density (cd format)
@@ -200,7 +200,7 @@
0, 0, 0};/* Blocklen */
if (orgmode4 == 0 && fAudioMode) {
- if (0 == get_orig_sectorsize(scgp, &orgmode4, &orgmode10, &orgmode11)) {
+ if (0 == get_orig_sectorsize(usalp, &orgmode4, &orgmode10, &orgmode11)) {
/* cannot retrieve density, sectorsize */
orgmode10 = (CD_FRAMESIZE >> 8L);
orgmode11 = (CD_FRAMESIZE & 0xFF);
@@ -219,15 +219,15 @@
mode [11] = orgmode11; /* (CD_FRAMESIZE & 0xFF); \* block length lsb */
}
- if (scgp->verbose) fprintf(stderr, "\nset density/sector size (EnableCddaModeSelect)...\n");
+ if (usalp->verbose) fprintf(stderr, "\nset density/sector size (EnableCddaModeSelect)...\n");
/* do the scsi cmd */
- if (mode_select(scgp, mode, 12, 0, scgp->inq->data_format >= 2) < 0)
+ if (mode_select(usalp, mode, 12, 0, usalp->inq->data_format >= 2) < 0)
fprintf (stderr, "Audio mode switch failed\n");
}
/* read CD Text information from the table of contents */
-void ReadTocTextSCSIMMC(SCSI *scgp)
+void ReadTocTextSCSIMMC(SCSI *usalp)
{
short datalength;
@@ -235,7 +235,7 @@
/* READTOC, MSF, format, res, res, res, Start track/session, len msb,
len lsb, control */
unsigned char *p = bufferTOC;
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->addr = (caddr_t)bufferTOC;
@@ -244,24 +244,24 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x43; /* Read TOC command */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.addr[0] = 5; /* format field */
scmd->cdb.g1_cdb.res6 = 0; /* track/session is reserved */
g1_cdblen(&scmd->cdb.g1_cdb, 4);
- scgp->silent++;
- if (scgp->verbose) fprintf(stderr, "\nRead TOC CD Text size ...");
+ usalp->silent++;
+ if (usalp->verbose) fprintf(stderr, "\nRead TOC CD Text size ...");
- scgp->cmdname = "read toc size (text)";
+ usalp->cmdname = "read toc size (text)";
- if (scg_cmd(scgp) < 0) {
- scgp->silent--;
+ if (usal_cmd(usalp) < 0) {
+ usalp->silent--;
if (global.quiet != 1)
fprintf (stderr, "Read TOC CD Text failed (probably not supported).\n");
p[0] = p[1] = '\0';
return ;
}
- scgp->silent--;
+ usalp->silent--;
datalength = (p[0] << 8) | (p[1]);
if (datalength <= 2)
@@ -274,24 +274,24 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x43; /* Read TOC command */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.addr[0] = 5; /* format field */
scmd->cdb.g1_cdb.res6 = 0; /* track/session is reserved */
g1_cdblen(&scmd->cdb.g1_cdb, 2+datalength);
- scgp->silent++;
- if (scgp->verbose) fprintf(stderr, "\nRead TOC CD Text data (length %hd)...", 2+datalength);
+ usalp->silent++;
+ if (usalp->verbose) fprintf(stderr, "\nRead TOC CD Text data (length %hd)...", 2+datalength);
- scgp->cmdname = "read toc data (text)";
+ usalp->cmdname = "read toc data (text)";
- if (scg_cmd(scgp) < 0) {
- scgp->silent--;
+ if (usal_cmd(usalp) < 0) {
+ usalp->silent--;
if (global.quiet != 1)
fprintf (stderr, "Read TOC CD Text data failed (probably not supported).\n");
p[0] = p[1] = '\0';
return ;
}
- scgp->silent--;
+ usalp->silent--;
#else
{ FILE *fp;
int read_;
@@ -309,11 +309,11 @@
}
/* read the full TOC */
-static unsigned ReadFullTOCSony(SCSI *scgp)
+static unsigned ReadFullTOCSony(SCSI *usalp)
{
/* READTOC, MSF, format, res, res, res, Start track/session, len msb,
len lsb, control */
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
unsigned tracks = 99;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
@@ -323,23 +323,23 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x43; /* Read TOC command */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.res6 = 1; /* session */
g1_cdblen(&scmd->cdb.g1_cdb, 4 + (3 + tracks + 6) * 11);
scmd->cdb.g1_cdb.vu_97 = 1; /* format */
- scgp->silent++;
- if (scgp->verbose) fprintf(stderr, "\nRead Full TOC Sony ...");
+ usalp->silent++;
+ if (usalp->verbose) fprintf(stderr, "\nRead Full TOC Sony ...");
- scgp->cmdname = "read full toc sony";
+ usalp->cmdname = "read full toc sony";
- if (scg_cmd(scgp) < 0) {
- scgp->silent--;
+ if (usal_cmd(usalp) < 0) {
+ usalp->silent--;
if (global.quiet != 1)
fprintf (stderr, "Read Full TOC Sony failed (probably not supported).\n");
return 0;
}
- scgp->silent--;
+ usalp->silent--;
return (unsigned)((bufferTOC[0] << 8) | bufferTOC[1]);
}
@@ -698,20 +698,20 @@
}
/* read the table of contents from the cd and fill the TOC array */
-unsigned ReadTocSony(SCSI *scgp)
+unsigned ReadTocSony(SCSI *usalp)
{
unsigned tracks = 0;
unsigned return_length;
struct outer *po = (struct outer *)bufferTOC;
- return_length = ReadFullTOCSony(scgp);
+ return_length = ReadFullTOCSony(usalp);
/* Check if the format was understood */
if ((return_length & 7) == 2 && (bufferTOC[3] - bufferTOC[2]) == (return_length >> 3)) {
/* The extended format seems not be understood, fallback to
* the classical format. */
- return ReadTocSCSI( scgp );
+ return ReadTocSCSI( usalp );
}
tracks = collect_tracks(po, ((return_length - 2) / 11), TRUE);
@@ -720,14 +720,14 @@
}
/* read the start of the lead-out from the first session TOC */
-unsigned ReadFirstSessionTOCSony(SCSI *scgp)
+unsigned ReadFirstSessionTOCSony(SCSI *usalp)
{
unsigned return_length;
if (first_session_leadout != 0)
return first_session_leadout;
- return_length = ReadFullTOCSony(scgp);
+ return_length = ReadFullTOCSony(usalp);
if (return_length >= 4 + (3 * 11) -2) {
unsigned off;
@@ -755,12 +755,12 @@
}
/* read the full TOC */
-static unsigned ReadFullTOCMMC(SCSI *scgp)
+static unsigned ReadFullTOCMMC(SCSI *usalp)
{
/* READTOC, MSF, format, res, res, res, Start track/session, len msb,
len lsb, control */
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
unsigned tracks = 99;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
@@ -770,32 +770,32 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x43; /* Read TOC command */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.addr[0] = 2; /* format */
scmd->cdb.g1_cdb.res6 = 1; /* session */
g1_cdblen(&scmd->cdb.g1_cdb, 4 + (tracks + 8) * 11);
- scgp->silent++;
- if (scgp->verbose) fprintf(stderr, "\nRead Full TOC MMC...");
+ usalp->silent++;
+ if (usalp->verbose) fprintf(stderr, "\nRead Full TOC MMC...");
- scgp->cmdname = "read full toc mmc";
+ usalp->cmdname = "read full toc mmc";
- if (scg_cmd(scgp) < 0) {
+ if (usal_cmd(usalp) < 0) {
if (global.quiet != 1)
fprintf (stderr, "Read Full TOC MMC failed (probably not supported).\n");
#ifdef B_BEOS_VERSION
#else
- scgp->silent--;
+ usalp->silent--;
return 0;
#endif
}
- scgp->silent--;
+ usalp->silent--;
return (unsigned)((bufferTOC[0] << 8) | bufferTOC[1]);
}
/* read the start of the lead-out from the first session TOC */
-unsigned ReadFirstSessionTOCMMC(SCSI *scgp)
+unsigned ReadFirstSessionTOCMMC(SCSI *usalp)
{
unsigned off;
unsigned return_length;
@@ -803,7 +803,7 @@
if (first_session_leadout != 0)
return first_session_leadout;
- return_length = ReadFullTOCMMC(scgp);
+ return_length = ReadFullTOCMMC(usalp);
/* We want the entry with POINT = 0xA2, which has the start position
of the first session lead out */
@@ -819,23 +819,23 @@
}
/* read the table of contents from the cd and fill the TOC array */
-unsigned ReadTocMMC(SCSI *scgp)
+unsigned ReadTocMMC(SCSI *usalp)
{
unsigned tracks = 0;
unsigned return_length;
struct outer *po = (struct outer *)bufferTOC;
- return_length = ReadFullTOCMMC(scgp);
+ return_length = ReadFullTOCMMC(usalp);
if (return_length - 2 < 4*11 || ((return_length - 2) % 11) != 0)
- return ReadTocSCSI(scgp);
+ return ReadTocSCSI(usalp);
tracks = collect_tracks(po, ((return_length - 2) / 11), FALSE);
return --tracks; /* without lead-out */
}
/* read the table of contents from the cd and fill the TOC array */
-unsigned ReadTocSCSI(SCSI *scgp)
+unsigned ReadTocSCSI(SCSI *usalp)
{
unsigned tracks;
int result;
@@ -844,7 +844,7 @@
/* first read the first and last track number */
/* READTOC, MSF format flag, res, res, res, res, Start track, len msb,
len lsb, flags */
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->addr = (caddr_t)bufferTOC;
@@ -853,15 +853,15 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x43; /* read TOC command */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.res6 = 1; /* start track */
g1_cdblen(&scmd->cdb.g1_cdb, 4);
- if (scgp->verbose) fprintf(stderr, "\nRead TOC size (standard)...");
+ if (usalp->verbose) fprintf(stderr, "\nRead TOC size (standard)...");
/* do the scsi cmd (read table of contents) */
- scgp->cmdname = "read toc size";
- if (scg_cmd(scgp) < 0)
+ usalp->cmdname = "read toc size";
+ if (usal_cmd(usalp) < 0)
FatalError ("Read TOC size failed.\n");
@@ -878,16 +878,16 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x43; /* read TOC command */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.res = 1; /* MSF format */
scmd->cdb.g1_cdb.res6 = 1; /* start track */
g1_cdblen(&scmd->cdb.g1_cdb, 4 + tracks * 8);
- if (scgp->verbose) fprintf(stderr, "\nRead TOC tracks (standard MSF)...");
+ if (usalp->verbose) fprintf(stderr, "\nRead TOC tracks (standard MSF)...");
/* do the scsi cmd (read table of contents) */
- scgp->cmdname = "read toc tracks ";
- result = scg_cmd(scgp);
+ usalp->cmdname = "read toc tracks ";
+ result = usal_cmd(usalp);
if (result < 0) {
/* MSF format did not succeeded */
@@ -920,16 +920,16 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x43; /* read TOC command */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.res = 0; /* LBA format */
scmd->cdb.g1_cdb.res6 = 1; /* start track */
g1_cdblen(&scmd->cdb.g1_cdb, 4 + tracks * 8);
- if (scgp->verbose) fprintf(stderr, "\nRead TOC tracks (standard LBA)...");
+ if (usalp->verbose) fprintf(stderr, "\nRead TOC tracks (standard LBA)...");
/* do the scsi cmd (read table of contents) */
- scgp->cmdname = "read toc tracks ";
- if (scg_cmd(scgp) < 0) {
+ usalp->cmdname = "read toc tracks ";
+ if (usal_cmd(usalp) < 0) {
FatalError ("Read TOC tracks (lba) failed.\n");
}
{
@@ -959,15 +959,15 @@
/* Read max. SectorBurst of cdda sectors to buffer
via standard SCSI-2 Read(10) command */
-static int ReadStandardLowlevel(SCSI *scgp, UINT4 *p, unsigned lSector,
+static int ReadStandardLowlevel(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal, unsigned secsize);
-static int ReadStandardLowlevel(SCSI *scgp, UINT4 *p, unsigned lSector,
+static int ReadStandardLowlevel(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal, unsigned secsize)
{
/* READ10, flags, block1 msb, block2, block3, block4 lsb, reserved,
transfer len msb, transfer len lsb, block addressing mode */
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->addr = (caddr_t)p;
@@ -976,40 +976,40 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x28; /* read 10 command */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.res |= (accepts_fua_bit == 1 ? 1 << 2 : 0);
g1_cdbaddr(&scmd->cdb.g1_cdb, lSector);
g1_cdblen(&scmd->cdb.g1_cdb, SectorBurstVal);
- if (scgp->verbose) fprintf(stderr, "\nReadStandard10 %s (%u)...", secsize > 2048 ? "CDDA" : "CD_DATA", secsize);
+ if (usalp->verbose) fprintf(stderr, "\nReadStandard10 %s (%u)...", secsize > 2048 ? "CDDA" : "CD_DATA", secsize);
- scgp->cmdname = "ReadStandard10";
+ usalp->cmdname = "ReadStandard10";
- if (scg_cmd(scgp)) return 0;
+ if (usal_cmd(usalp)) return 0;
/* has all or something been read? */
- return SectorBurstVal - scg_getresid(scgp)/secsize;
+ return SectorBurstVal - usal_getresid(usalp)/secsize;
}
int
-ReadStandard(SCSI *scgp, UINT4 *p, unsigned lSector, unsigned SectorBurstVal)
+ReadStandard(SCSI *usalp, UINT4 *p, unsigned lSector, unsigned SectorBurstVal)
{
- return ReadStandardLowlevel(scgp, p, lSector, SectorBurstVal, CD_FRAMESIZE_RAW);
+ return ReadStandardLowlevel(usalp, p, lSector, SectorBurstVal, CD_FRAMESIZE_RAW);
}
int
-ReadStandardData(SCSI *scgp, UINT4 *p, unsigned lSector, unsigned SectorBurstVal)
+ReadStandardData(SCSI *usalp, UINT4 *p, unsigned lSector, unsigned SectorBurstVal)
{
- return ReadStandardLowlevel(scgp, p, lSector, SectorBurstVal, CD_FRAMESIZE);
+ return ReadStandardLowlevel(usalp, p, lSector, SectorBurstVal, CD_FRAMESIZE);
}
/* Read max. SectorBurst of cdda sectors to buffer
via vendor-specific ReadCdda(10) command */
-int ReadCdda10(SCSI *scgp, UINT4 *p, unsigned lSector, unsigned SectorBurstVal)
+int ReadCdda10(SCSI *usalp, UINT4 *p, unsigned lSector, unsigned SectorBurstVal)
{
/* READ10, flags, block1 msb, block2, block3, block4 lsb, reserved,
transfer len msb, transfer len lsb, block addressing mode */
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->addr = (caddr_t)p;
@@ -1018,26 +1018,26 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xd4; /* Read audio command */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.res |= (accepts_fua_bit == 1 ? 1 << 2 : 0);
g1_cdbaddr(&scmd->cdb.g1_cdb, lSector);
g1_cdblen(&scmd->cdb.g1_cdb, SectorBurstVal);
- if (scgp->verbose) fprintf(stderr, "\nReadNEC10 CDDA...");
+ if (usalp->verbose) fprintf(stderr, "\nReadNEC10 CDDA...");
- scgp->cmdname = "Read10 NEC";
+ usalp->cmdname = "Read10 NEC";
- if (scg_cmd(scgp)) return 0;
+ if (usal_cmd(usalp)) return 0;
/* has all or something been read? */
- return SectorBurstVal - scg_getresid(scgp)/CD_FRAMESIZE_RAW;
+ return SectorBurstVal - usal_getresid(usalp)/CD_FRAMESIZE_RAW;
}
/* Read max. SectorBurst of cdda sectors to buffer
via vendor-specific ReadCdda(12) command */
-int ReadCdda12(SCSI *scgp, UINT4 *p, unsigned lSector, unsigned SectorBurstVal)
+int ReadCdda12(SCSI *usalp, UINT4 *p, unsigned lSector, unsigned SectorBurstVal)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->addr = (caddr_t)p;
@@ -1046,19 +1046,19 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xd8; /* read audio command */
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g5_cdb.res |= (accepts_fua_bit == 1 ? 1 << 2 : 0);
g5_cdbaddr(&scmd->cdb.g5_cdb, lSector);
g5_cdblen(&scmd->cdb.g5_cdb, SectorBurstVal);
- if (scgp->verbose) fprintf(stderr, "\nReadSony12 CDDA...");
+ if (usalp->verbose) fprintf(stderr, "\nReadSony12 CDDA...");
- scgp->cmdname = "Read12";
+ usalp->cmdname = "Read12";
- if (scg_cmd(scgp)) return 0;
+ if (usal_cmd(usalp)) return 0;
/* has all or something been read? */
- return SectorBurstVal - scg_getresid(scgp)/CD_FRAMESIZE_RAW;
+ return SectorBurstVal - usal_getresid(usalp)/CD_FRAMESIZE_RAW;
}
/* Read max. SectorBurst of cdda sectors to buffer
@@ -1068,10 +1068,10 @@
> normal and the number of sectors is coded in Byte 8 and 9 (begining with 0).
*/
-int ReadCdda12Matsushita(SCSI *scgp, UINT4 *p, unsigned lSector,
+int ReadCdda12Matsushita(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->addr = (caddr_t)p;
@@ -1080,28 +1080,28 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xd4; /* read audio command */
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g5_cdb.res |= (accepts_fua_bit == 1 ? 1 << 2 : 0);
g5_cdbaddr(&scmd->cdb.g5_cdb, lSector);
g5_cdblen(&scmd->cdb.g5_cdb, SectorBurstVal);
- if (scgp->verbose) fprintf(stderr, "\nReadMatsushita12 CDDA...");
+ if (usalp->verbose) fprintf(stderr, "\nReadMatsushita12 CDDA...");
- scgp->cmdname = "Read12Matsushita";
+ usalp->cmdname = "Read12Matsushita";
- if (scg_cmd(scgp)) return 0;
+ if (usal_cmd(usalp)) return 0;
/* has all or something been read? */
- return SectorBurstVal - scg_getresid(scgp)/CD_FRAMESIZE_RAW;
+ return SectorBurstVal - usal_getresid(usalp)/CD_FRAMESIZE_RAW;
}
/* Read max. SectorBurst of cdda sectors to buffer
via MMC standard READ CD command */
-int ReadCddaMMC12(SCSI *scgp, UINT4 *p, unsigned lSector,
+int ReadCddaMMC12(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal)
{
- register struct scg_cmd *scmd;
- scmd = scgp->scmd;
+ register struct usal_cmd *scmd;
+ scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->addr = (caddr_t)p;
@@ -1110,56 +1110,56 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xbe; /* read cd command */
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g5_cdb.res = 1 << 1; /* expected sector type field CDDA */
g5_cdbaddr(&scmd->cdb.g5_cdb, lSector);
g5x_cdblen(&scmd->cdb.g5_cdb, SectorBurstVal);
scmd->cdb.g5_cdb.count[3] = 1 << 4; /* User data */
- if (scgp->verbose) fprintf(stderr, "\nReadMMC12 CDDA...");
+ if (usalp->verbose) fprintf(stderr, "\nReadMMC12 CDDA...");
- scgp->cmdname = "ReadCD MMC 12";
+ usalp->cmdname = "ReadCD MMC 12";
- if (scg_cmd(scgp)) return 0;
+ if (usal_cmd(usalp)) return 0;
/* has all or something been read? */
- return SectorBurstVal - scg_getresid(scgp)/CD_FRAMESIZE_RAW;
+ return SectorBurstVal - usal_getresid(usalp)/CD_FRAMESIZE_RAW;
}
-int ReadCddaFallbackMMC(SCSI *scgp, UINT4 *p, unsigned lSector,
+int ReadCddaFallbackMMC(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal)
{
static int ReadCdda12_unknown = 0;
int retval = -999;
- scgp->silent++;
+ usalp->silent++;
if (ReadCdda12_unknown
- || ((retval = ReadCdda12(scgp, p, lSector, SectorBurstVal)) <= 0)) {
+ || ((retval = ReadCdda12(usalp, p, lSector, SectorBurstVal)) <= 0)) {
/* if the command is not available, use the regular
* MMC ReadCd
*/
- if (retval <= 0 && scg_sense_key(scgp) == 0x05) {
+ if (retval <= 0 && usal_sense_key(usalp) == 0x05) {
ReadCdda12_unknown = 1;
}
- scgp->silent--;
+ usalp->silent--;
ReadCdRom = ReadCddaMMC12;
ReadCdRomSub = ReadCddaSubMMC12;
- return ReadCddaMMC12(scgp, p, lSector, SectorBurstVal);
+ return ReadCddaMMC12(usalp, p, lSector, SectorBurstVal);
}
- scgp->silent--;
+ usalp->silent--;
return retval;
}
/* Read the Sub-Q-Channel to SubQbuffer. This is the method for
* drives that do not support subchannel parameters. */
#ifdef PROTOTYPES
-static subq_chnl *ReadSubQFallback (SCSI *scgp, unsigned char sq_format, unsigned char track)
+static subq_chnl *ReadSubQFallback (SCSI *usalp, unsigned char sq_format, unsigned char track)
#else
static subq_chnl *
-ReadSubQFallback(SCSI *scgp, unsigned char sq_format, unsigned char track)
+ReadSubQFallback(SCSI *usalp, unsigned char sq_format, unsigned char track)
#endif
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->addr = (caddr_t)SubQbuffer;
@@ -1169,17 +1169,17 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x42; /* Read SubQChannel */
/* use LBA */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.addr[0] = 0x40; /* SubQ info */
scmd->cdb.g1_cdb.addr[1] = 0; /* parameter list: all */
scmd->cdb.g1_cdb.res6 = track; /* track number */
g1_cdblen(&scmd->cdb.g1_cdb, 24);
- if (scgp->verbose) fprintf(stderr, "\nRead Subchannel_dumb...");
+ if (usalp->verbose) fprintf(stderr, "\nRead Subchannel_dumb...");
- scgp->cmdname = "Read Subchannel_dumb";
+ usalp->cmdname = "Read Subchannel_dumb";
- if (scg_cmd(scgp) < 0) {
+ if (usal_cmd(usalp) < 0) {
fprintf( stderr, "Read SubQ failed\n");
}
@@ -1199,14 +1199,14 @@
/* Read the Sub-Q-Channel to SubQbuffer */
#ifdef PROTOTYPES
-subq_chnl *ReadSubQSCSI (SCSI *scgp, unsigned char sq_format, unsigned char track)
+subq_chnl *ReadSubQSCSI (SCSI *usalp, unsigned char sq_format, unsigned char track)
#else
subq_chnl *
-ReadSubQSCSI(SCSI *scgp, unsigned char sq_format, unsigned char track)
+ReadSubQSCSI(SCSI *usalp, unsigned char sq_format, unsigned char track)
#endif
{
int resp_size;
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
switch (sq_format) {
case GET_POSITIONDATA:
@@ -1233,19 +1233,19 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x42;
/* use LBA */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.addr[0] = 0x40; /* SubQ info */
scmd->cdb.g1_cdb.addr[1] = sq_format; /* parameter list: all */
scmd->cdb.g1_cdb.res6 = track; /* track number */
g1_cdblen(&scmd->cdb.g1_cdb, resp_size);
- if (scgp->verbose) fprintf(stderr, "\nRead Subchannel...");
+ if (usalp->verbose) fprintf(stderr, "\nRead Subchannel...");
- scgp->cmdname = "Read Subchannel";
+ usalp->cmdname = "Read Subchannel";
- if (scg_cmd(scgp) < 0) {
+ if (usal_cmd(usalp) < 0) {
/* in case of error do a fallback for dumb firmwares */
- return ReadSubQFallback(scgp, sq_format, track);
+ return ReadSubQFallback(usalp, sq_format, track);
}
if (sq_format == GET_POSITIONDATA)
@@ -1266,9 +1266,9 @@
}
int
-ReadCddaSubSony(SCSI *scgp, UINT4 *p, unsigned lSector, unsigned SectorBurstVal)
+ReadCddaSubSony(SCSI *usalp, UINT4 *p, unsigned lSector, unsigned SectorBurstVal)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->addr = (caddr_t)p;
@@ -1277,29 +1277,29 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xd8; /* read audio command */
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g5_cdb.res |= (accepts_fua_bit == 1 ? 1 << 2 : 0);
scmd->cdb.g5_cdb.res10 = 0x01; /* subcode 1 -> cdda + 16 * q sub */
g5_cdbaddr(&scmd->cdb.g5_cdb, lSector);
g5_cdblen(&scmd->cdb.g5_cdb, SectorBurstVal);
- if (scgp->verbose) fprintf(stderr, "\nReadSony12 CDDA + SubChannels...");
+ if (usalp->verbose) fprintf(stderr, "\nReadSony12 CDDA + SubChannels...");
- scgp->cmdname = "Read12SubChannelsSony";
+ usalp->cmdname = "Read12SubChannelsSony";
- if (scg_cmd(scgp)) return -1;
+ if (usal_cmd(usalp)) return -1;
/* has all or something been read? */
- return scg_getresid(scgp) != 0;
+ return usal_getresid(usalp) != 0;
}
-int ReadCddaSub96Sony(SCSI *scgp, UINT4 *p, unsigned lSector,
+int ReadCddaSub96Sony(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal);
-int ReadCddaSub96Sony(SCSI *scgp, UINT4 *p, unsigned lSector,
+int ReadCddaSub96Sony(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->addr = (caddr_t)p;
@@ -1308,26 +1308,26 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xd8; /* read audio command */
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g5_cdb.res |= (accepts_fua_bit == 1 ? 1 << 2 : 0);
scmd->cdb.g5_cdb.res10 = 0x02; /* subcode 2 -> cdda + 96 * q sub */
g5_cdbaddr(&scmd->cdb.g5_cdb, lSector);
g5_cdblen(&scmd->cdb.g5_cdb, SectorBurstVal);
- if (scgp->verbose) fprintf(stderr, "\nReadSony12 CDDA + 96 byte SubChannels...");
+ if (usalp->verbose) fprintf(stderr, "\nReadSony12 CDDA + 96 byte SubChannels...");
- scgp->cmdname = "Read12SubChannelsSony";
+ usalp->cmdname = "Read12SubChannelsSony";
- if (scg_cmd(scgp)) return -1;
+ if (usal_cmd(usalp)) return -1;
/* has all or something been read? */
- return scg_getresid(scgp) != 0;
+ return usal_getresid(usalp) != 0;
}
-subq_chnl *ReadSubChannelsSony(SCSI *scgp, unsigned lSector)
+subq_chnl *ReadSubChannelsSony(SCSI *usalp, unsigned lSector)
{
- /*int retval = ReadCddaSub96Sony(scgp, (UINT4 *)bufferTOC, lSector, 1);*/
- int retval = ReadCddaSubSony(scgp, (UINT4 *)bufferTOC, lSector, 1);
+ /*int retval = ReadCddaSub96Sony(usalp, (UINT4 *)bufferTOC, lSector, 1);*/
+ int retval = ReadCddaSubSony(usalp, (UINT4 *)bufferTOC, lSector, 1);
if (retval != 0) return NULL;
return fill_subchannel(bufferTOC);
@@ -1335,10 +1335,10 @@
/* Read max. SectorBurst of cdda sectors to buffer
via MMC standard READ CD command */
-int ReadCddaSubMMC12(SCSI *scgp, UINT4 *p, unsigned lSector, unsigned SectorBurstVal)
+int ReadCddaSubMMC12(SCSI *usalp, UINT4 *p, unsigned lSector, unsigned SectorBurstVal)
{
- register struct scg_cmd *scmd;
- scmd = scgp->scmd;
+ register struct usal_cmd *scmd;
+ scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->addr = (caddr_t)p;
@@ -1347,58 +1347,58 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xbe; /* read cd command */
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g5_cdb.res = 1 << 1; /* expected sector type field CDDA */
g5_cdbaddr(&scmd->cdb.g5_cdb, lSector);
g5x_cdblen(&scmd->cdb.g5_cdb, SectorBurstVal);
scmd->cdb.g5_cdb.count[3] = 1 << 4; /* User data */
scmd->cdb.g5_cdb.res10 = 0x02; /* subcode 2 -> cdda + 16 * q sub */
- if (scgp->verbose) fprintf(stderr, "\nReadMMC12 CDDA + SUB...");
+ if (usalp->verbose) fprintf(stderr, "\nReadMMC12 CDDA + SUB...");
- scgp->cmdname = "ReadCD Sub MMC 12";
+ usalp->cmdname = "ReadCD Sub MMC 12";
- if (scg_cmd(scgp)) return -1;
+ if (usal_cmd(usalp)) return -1;
/* has all or something been read? */
- return scg_getresid(scgp) != 0;
+ return usal_getresid(usalp) != 0;
}
-static subq_chnl *ReadSubChannelsMMC(SCSI *scgp, unsigned lSector);
-static subq_chnl *ReadSubChannelsMMC(SCSI *scgp, unsigned lSector)
+static subq_chnl *ReadSubChannelsMMC(SCSI *usalp, unsigned lSector);
+static subq_chnl *ReadSubChannelsMMC(SCSI *usalp, unsigned lSector)
{
- int retval = ReadCddaSubMMC12(scgp, (UINT4 *)bufferTOC, lSector, 1);
+ int retval = ReadCddaSubMMC12(usalp, (UINT4 *)bufferTOC, lSector, 1);
if (retval != 0) return NULL;
return fill_subchannel(bufferTOC);
}
-subq_chnl *ReadSubChannelsFallbackMMC(SCSI *scgp, unsigned lSector)
+subq_chnl *ReadSubChannelsFallbackMMC(SCSI *usalp, unsigned lSector)
{
static int ReadSubSony_unknown = 0;
subq_chnl *retval = NULL;
- scgp->silent++;
+ usalp->silent++;
if (ReadSubSony_unknown
- || ((retval = ReadSubChannelsSony(scgp, lSector)) == NULL)) {
+ || ((retval = ReadSubChannelsSony(usalp, lSector)) == NULL)) {
/* if the command is not available, use the regular
* MMC ReadCd
*/
- if (retval == NULL && scg_sense_key(scgp) == 0x05) {
+ if (retval == NULL && usal_sense_key(usalp) == 0x05) {
ReadSubSony_unknown = 1;
}
- scgp->silent--;
- return ReadSubChannelsMMC(scgp, lSector);
+ usalp->silent--;
+ return ReadSubChannelsMMC(usalp, lSector);
}
- scgp->silent--;
+ usalp->silent--;
return retval;
}
-subq_chnl *ReadStandardSub(scgp, lSector)
- SCSI *scgp;
+subq_chnl *ReadStandardSub(usalp, lSector)
+ SCSI *usalp;
unsigned lSector;
{
- if (0 == ReadStandardLowlevel (scgp, (UINT4 *)bufferTOC, lSector, 1, CD_FRAMESIZE_RAW + 16 )) {
+ if (0 == ReadStandardLowlevel (usalp, (UINT4 *)bufferTOC, lSector, 1, CD_FRAMESIZE_RAW + 16 )) {
return NULL;
}
#if 0
@@ -1418,7 +1418,7 @@
}
/********* non standardized speed selects ***********************/
-void SpeedSelectSCSIToshiba(SCSI *scgp, unsigned speed)
+void SpeedSelectSCSIToshiba(SCSI *usalp, unsigned speed)
{
static unsigned char mode [4 + 3];
unsigned char *page = mode + 4;
@@ -1430,21 +1430,21 @@
page[1] = 1;
page[2] = speed; /* 0 for single speed, 1 for double speed (3401) */
- if (scgp->verbose) fprintf(stderr, "\nspeed select Toshiba...");
+ if (usalp->verbose) fprintf(stderr, "\nspeed select Toshiba...");
- scgp->silent++;
+ usalp->silent++;
/* do the scsi cmd */
- if ((retval = mode_select(scgp, mode, 7, 0, scgp->inq->data_format >= 2)) < 0)
+ if ((retval = mode_select(usalp, mode, 7, 0, usalp->inq->data_format >= 2)) < 0)
fprintf (stderr, "speed select Toshiba failed\n");
- scgp->silent--;
+ usalp->silent--;
}
-void SpeedSelectSCSINEC(SCSI *scgp, unsigned speed)
+void SpeedSelectSCSINEC(SCSI *usalp, unsigned speed)
{
static unsigned char mode [4 + 8];
unsigned char *page = mode + 4;
int retval;
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)mode, sizeof(mode), '\0');
/* the first 4 mode bytes are zero. */
@@ -1460,20 +1460,20 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xC5;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.addr[0] = 0 ? 1 : 0 | 1 ? 0x10 : 0;
g1_cdblen(&scmd->cdb.g1_cdb, 12);
- if (scgp->verbose) fprintf(stderr, "\nspeed select NEC...");
+ if (usalp->verbose) fprintf(stderr, "\nspeed select NEC...");
/* do the scsi cmd */
- scgp->cmdname = "speed select NEC";
+ usalp->cmdname = "speed select NEC";
- if ((retval = scg_cmd(scgp)) < 0)
+ if ((retval = usal_cmd(usalp)) < 0)
fprintf(stderr ,"speed select NEC failed\n");
}
-void SpeedSelectSCSIPhilipsCDD2600(SCSI *scgp, unsigned speed)
+void SpeedSelectSCSIPhilipsCDD2600(SCSI *usalp, unsigned speed)
{
/* MODE_SELECT, page = SCSI-2 save page disabled, reserved, reserved,
parm list len, flags */
@@ -1488,13 +1488,13 @@
page[2] = page [4] = speed;
page[3] = 1;
- if (scgp->verbose) fprintf(stderr, "\nspeed select Philips...");
+ if (usalp->verbose) fprintf(stderr, "\nspeed select Philips...");
/* do the scsi cmd */
- if ((retval = mode_select(scgp, mode, 12, 0, scgp->inq->data_format >= 2)) < 0)
+ if ((retval = mode_select(usalp, mode, 12, 0, usalp->inq->data_format >= 2)) < 0)
fprintf (stderr, "speed select PhilipsCDD2600 failed\n");
}
-void SpeedSelectSCSISony(SCSI *scgp, unsigned speed)
+void SpeedSelectSCSISony(SCSI *usalp, unsigned speed)
{
static unsigned char mode [4 + 4];
unsigned char *page = mode + 4;
@@ -1506,16 +1506,16 @@
page[1] = 2;
page[2] = speed;
- if (scgp->verbose) fprintf(stderr, "\nspeed select Sony...");
+ if (usalp->verbose) fprintf(stderr, "\nspeed select Sony...");
/* do the scsi cmd */
- scgp->silent++;
- if ((retval = mode_select(scgp, mode, 8, 0, scgp->inq->data_format >= 2)) < 0)
+ usalp->silent++;
+ if ((retval = mode_select(usalp, mode, 8, 0, usalp->inq->data_format >= 2)) < 0)
fprintf (stderr, "speed select Sony failed\n");
- scgp->silent--;
+ usalp->silent--;
}
-void SpeedSelectSCSIYamaha (scgp, speed)
- SCSI *scgp;
+void SpeedSelectSCSIYamaha (usalp, speed)
+ SCSI *usalp;
unsigned speed;
{
static unsigned char mode [4 + 4];
@@ -1528,16 +1528,16 @@
page[1] = 2;
page[2] = speed;
- if (scgp->verbose) fprintf(stderr, "\nspeed select Yamaha...");
+ if (usalp->verbose) fprintf(stderr, "\nspeed select Yamaha...");
/* do the scsi cmd */
- if ((retval = mode_select(scgp, mode, 8, 0, scgp->inq->data_format >= 2)) < 0)
+ if ((retval = mode_select(usalp, mode, 8, 0, usalp->inq->data_format >= 2)) < 0)
fprintf (stderr, "speed select Yamaha failed\n");
}
-void SpeedSelectSCSIMMC(SCSI *scgp, unsigned speed)
+void SpeedSelectSCSIMMC(SCSI *usalp, unsigned speed)
{
int spd;
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
if (speed == 0 || speed == 0xFFFF) {
spd = 0xFFFF;
@@ -1549,33 +1549,33 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xBB;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
i_to_2_byte(&scmd->cdb.g5_cdb.addr[0], spd);
i_to_2_byte(&scmd->cdb.g5_cdb.addr[2], 0xffff);
- if (scgp->verbose) fprintf(stderr, "\nspeed select MMC...");
+ if (usalp->verbose) fprintf(stderr, "\nspeed select MMC...");
- scgp->cmdname = "set cd speed";
+ usalp->cmdname = "set cd speed";
- scgp->silent++;
- if (scg_cmd(scgp) < 0) {
- if (scg_sense_key(scgp) == 0x05 &&
- scg_sense_code(scgp) == 0x20 &&
- scg_sense_qual(scgp) == 0x00) {
+ usalp->silent++;
+ if (usal_cmd(usalp) < 0) {
+ if (usal_sense_key(usalp) == 0x05 &&
+ usal_sense_code(usalp) == 0x20 &&
+ usal_sense_qual(usalp) == 0x00) {
/* this optional command is not implemented */
} else {
- scg_printerr(scgp);
+ usal_printerr(usalp);
fprintf (stderr, "speed select MMC failed\n");
}
}
- scgp->silent--;
+ usalp->silent--;
}
/* request vendor brand and model */
-unsigned char *Inquiry(SCSI *scgp)
+unsigned char *Inquiry(SCSI *usalp)
{
static unsigned char *Inqbuffer = NULL;
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
if (Inqbuffer == NULL) {
Inqbuffer = malloc(36);
@@ -1593,19 +1593,19 @@
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = SC_INQUIRY;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
scmd->cdb.g0_cdb.count = 36;
- scgp->cmdname = "inquiry";
+ usalp->cmdname = "inquiry";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (NULL);
/* define structure with inquiry data */
- memcpy(scgp->inq, Inqbuffer, sizeof(*scgp->inq));
+ memcpy(usalp->inq, Inqbuffer, sizeof(*usalp->inq));
- if (scgp->verbose)
- scg_prbytes("Inquiry Data :", (Uchar *)Inqbuffer, 22 - scmd->resid);
+ if (usalp->verbose)
+ usal_prbytes("Inquiry Data :", (Uchar *)Inqbuffer, 22 - scmd->resid);
return (Inqbuffer);
}
@@ -1619,9 +1619,9 @@
#define NO_MEDIA_SC 0x3a
#define NO_MEDIA_SCQ 0x00
-int TestForMedium(SCSI *scgp)
+int TestForMedium(SCSI *usalp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
if (interface != GENERIC_SCSI) {
return 1;
@@ -1635,18 +1635,18 @@
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = SC_TEST_UNIT_READY;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
- if (scgp->verbose) fprintf(stderr, "\ntest unit ready...");
- scgp->silent++;
+ if (usalp->verbose) fprintf(stderr, "\ntest unit ready...");
+ usalp->silent++;
- scgp->cmdname = "test unit ready";
+ usalp->cmdname = "test unit ready";
- if (scg_cmd(scgp) >= 0) {
- scgp->silent--;
+ if (usal_cmd(usalp) >= 0) {
+ usalp->silent--;
return 1;
}
- scgp->silent--;
+ usalp->silent--;
if (scmd->sense.code >= SC_CLASS_EXTENDED_SENSE) {
return
@@ -1659,9 +1659,9 @@
}
}
-int StopPlaySCSI(SCSI *scgp)
+int StopPlaySCSI(SCSI *usalp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->addr = NULL;
@@ -1670,19 +1670,19 @@
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = 0x1b;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
- if (scgp->verbose) fprintf(stderr, "\nstop audio play");
+ if (usalp->verbose) fprintf(stderr, "\nstop audio play");
/* do the scsi cmd */
- scgp->cmdname = "stop audio play";
+ usalp->cmdname = "stop audio play";
- return scg_cmd(scgp) >= 0 ? 0 : -1;
+ return usal_cmd(usalp) >= 0 ? 0 : -1;
}
-int Play_atSCSI(SCSI *scgp, unsigned int from_sector, unsigned int sectors)
+int Play_atSCSI(SCSI *usalp, unsigned int from_sector, unsigned int sectors)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->addr = NULL;
@@ -1691,7 +1691,7 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x47;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.addr[1] = (from_sector + 150) / (60*75);
scmd->cdb.g1_cdb.addr[2] = ((from_sector + 150) / 75) % 60;
scmd->cdb.g1_cdb.addr[3] = (from_sector + 150) % 75;
@@ -1699,25 +1699,25 @@
scmd->cdb.g1_cdb.count[0] = ((from_sector + 150 + sectors) / 75) % 60;
scmd->cdb.g1_cdb.count[1] = (from_sector + 150 + sectors) % 75;
- if (scgp->verbose) fprintf(stderr, "\nplay sectors...");
+ if (usalp->verbose) fprintf(stderr, "\nplay sectors...");
/* do the scsi cmd */
- scgp->cmdname = "play sectors";
+ usalp->cmdname = "play sectors";
- return scg_cmd(scgp) >= 0 ? 0 : -1;
+ return usal_cmd(usalp) >= 0 ? 0 : -1;
}
static caddr_t scsibuffer; /* page aligned scsi transfer buffer */
void init_scsibuf(SCSI *scsp, unsigned amt);
-void init_scsibuf(SCSI *scgp, unsigned amt)
+void init_scsibuf(SCSI *usalp, unsigned amt)
{
if (scsibuffer != NULL) {
fprintf(stderr, "the SCSI transfer buffer has already been allocated!\n");
exit(SETUPSCSI_ERROR);
}
- scsibuffer = scg_getbuf(scgp, amt);
+ scsibuffer = usal_getbuf(usalp, amt);
if (scsibuffer == NULL) {
fprintf(stderr, "could not get SCSI transfer buffer!\n");
exit(SETUPSCSI_ERROR);
Modified: cdrkit/trunk/cdda2wav/scsi_cmds.h
===================================================================
--- cdrkit/trunk/cdda2wav/scsi_cmds.h 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/cdda2wav/scsi_cmds.h 2006-11-23 18:57:28 UTC (rev 430)
@@ -15,54 +15,54 @@
extern unsigned char *cmd;
struct TOC;
-int SCSI_emulated_ATAPI_on(SCSI *scgp);
-unsigned char *Inquiry(SCSI *scgp);
-int TestForMedium(SCSI *scgp);
-void SpeedSelectSCSIMMC(SCSI *scgp, unsigned speed);
-void SpeedSelectSCSIYamaha(SCSI *scgp, unsigned speed);
-void SpeedSelectSCSISony(SCSI *scgp, unsigned speed);
-void SpeedSelectSCSIPhilipsCDD2600(SCSI *scgp, unsigned speed);
-void SpeedSelectSCSINEC(SCSI *scgp, unsigned speed);
-void SpeedSelectSCSIToshiba(SCSI *scgp, unsigned speed);
-subq_chnl *ReadSubQSCSI(SCSI *scgp, unsigned char sq_format,
+int SCSI_emulated_ATAPI_on(SCSI *usalp);
+unsigned char *Inquiry(SCSI *usalp);
+int TestForMedium(SCSI *usalp);
+void SpeedSelectSCSIMMC(SCSI *usalp, unsigned speed);
+void SpeedSelectSCSIYamaha(SCSI *usalp, unsigned speed);
+void SpeedSelectSCSISony(SCSI *usalp, unsigned speed);
+void SpeedSelectSCSIPhilipsCDD2600(SCSI *usalp, unsigned speed);
+void SpeedSelectSCSINEC(SCSI *usalp, unsigned speed);
+void SpeedSelectSCSIToshiba(SCSI *usalp, unsigned speed);
+subq_chnl *ReadSubQSCSI(SCSI *usalp, unsigned char sq_format,
unsigned char ltrack);
-subq_chnl *ReadSubChannelsSony(SCSI *scgp, unsigned lSector);
-subq_chnl *ReadSubChannelsFallbackMMC(SCSI *scgp, unsigned lSector);
-subq_chnl *ReadStandardSub(SCSI *scgp, unsigned lSector);
-int ReadCddaMMC12(SCSI *scgp, UINT4 *p, unsigned lSector,
+subq_chnl *ReadSubChannelsSony(SCSI *usalp, unsigned lSector);
+subq_chnl *ReadSubChannelsFallbackMMC(SCSI *usalp, unsigned lSector);
+subq_chnl *ReadStandardSub(SCSI *usalp, unsigned lSector);
+int ReadCddaMMC12(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal);
-int ReadCdda12Matsushita(SCSI *scgp, UINT4 *p, unsigned lSector,
+int ReadCdda12Matsushita(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal);
-int ReadCdda12(SCSI *scgp, UINT4 *p, unsigned lSector, unsigned SecorBurstVal);
-int ReadCdda10(SCSI *scgp, UINT4 *p, unsigned lSector, unsigned SecorBurstVal);
-int ReadStandard(SCSI *scgp, UINT4 *p, unsigned lSector,
+int ReadCdda12(SCSI *usalp, UINT4 *p, unsigned lSector, unsigned SecorBurstVal);
+int ReadCdda10(SCSI *usalp, UINT4 *p, unsigned lSector, unsigned SecorBurstVal);
+int ReadStandard(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SctorBurstVal);
-int ReadStandardData(SCSI *scgp, UINT4 *p, unsigned lSector,
+int ReadStandardData(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SctorBurstVal);
-int ReadCddaFallbackMMC(SCSI *scgp, UINT4 *p, unsigned lSector,
+int ReadCddaFallbackMMC(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SctorBurstVal);
-int ReadCddaSubSony(SCSI *scgp, UINT4 *p, unsigned lSector,
+int ReadCddaSubSony(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal);
-int ReadCddaSub96Sony(SCSI *scgp, UINT4 *p, unsigned lSector,
+int ReadCddaSub96Sony(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal);
-int ReadCddaSubMMC12(SCSI *scgp, UINT4 *p, unsigned lSector,
+int ReadCddaSubMMC12(SCSI *usalp, UINT4 *p, unsigned lSector,
unsigned SectorBurstVal);
-unsigned ReadTocSony(SCSI *scgp);
-unsigned ReadTocMMC(SCSI *scgp);
-unsigned ReadTocSCSI(SCSI *scgp);
-unsigned ReadFirstSessionTOCSony(SCSI *scgp);
-unsigned ReadFirstSessionTOCMMC(SCSI *scgp);
-void ReadTocTextSCSIMMC(SCSI *scgp);
-int Play_atSCSI(SCSI *scgp, unsigned int from_sector, unsigned int sectors);
-int StopPlaySCSI(SCSI *scgp);
-void EnableCddaModeSelect(SCSI *scgp, int fAudioMode, unsigned uSectorsize);
-int set_sectorsize(SCSI *scgp, unsigned int secsize);
+unsigned ReadTocSony(SCSI *usalp);
+unsigned ReadTocMMC(SCSI *usalp);
+unsigned ReadTocSCSI(SCSI *usalp);
+unsigned ReadFirstSessionTOCSony(SCSI *usalp);
+unsigned ReadFirstSessionTOCMMC(SCSI *usalp);
+void ReadTocTextSCSIMMC(SCSI *usalp);
+int Play_atSCSI(SCSI *usalp, unsigned int from_sector, unsigned int sectors);
+int StopPlaySCSI(SCSI *usalp);
+void EnableCddaModeSelect(SCSI *usalp, int fAudioMode, unsigned uSectorsize);
+int set_sectorsize(SCSI *usalp, unsigned int secsize);
unsigned int
-get_orig_sectorsize(SCSI *scgp, unsigned char *m4, unsigned char *m10,
+get_orig_sectorsize(SCSI *usalp, unsigned char *m4, unsigned char *m10,
unsigned char *m11);
-int heiko_mmc(SCSI *scgp);
-void init_scsibuf(SCSI *scgp, unsigned amt);
-int myscsierr(SCSI *scgp);
+int heiko_mmc(SCSI *usalp);
+void init_scsibuf(SCSI *usalp, unsigned amt);
+int myscsierr(SCSI *usalp);
extern int accepts_fua_bit;
extern unsigned char density;
Modified: cdrkit/trunk/cdda2wav/semshm.c
===================================================================
--- cdrkit/trunk/cdda2wav/semshm.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/cdda2wav/semshm.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -84,7 +84,7 @@
#endif
#endif
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
#ifdef USE_BEOS_AREAS
#include <be/kernel/OS.h>
Modified: cdrkit/trunk/cdda2wav/toc.c
===================================================================
--- cdrkit/trunk/cdda2wav/toc.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/cdda2wav/toc.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -59,7 +59,7 @@
#undef DEBUG_CDDBP
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
#include "mytype.h"
#include "byteorder.h"
@@ -226,15 +226,15 @@
static int can_read_illleadout()
{
- SCSI *scgp = get_scsi_p();
+ SCSI *usalp = get_scsi_p();
UINT4 buffer [CD_FRAMESIZE_RAW/4];
if (global.illleadout_cd == 0) return 0;
- scgp->silent++;
+ usalp->silent++;
global.reads_illleadout =
- ReadCdRom(scgp, buffer, Get_AudioStartSector(CDROM_LEADOUT), 1);
- scgp->silent--;
+ ReadCdRom(usalp, buffer, Get_AudioStartSector(CDROM_LEADOUT), 1);
+ usalp->silent--;
return global.reads_illleadout;
}
@@ -2668,7 +2668,7 @@
get_scsi_p()->silent++;
sub_ch = ReadSubChannels(get_scsi_p(), sec);
get_scsi_p()->silent--;
- if (sub_ch == NULL /*&& (scg_sense_key(get_scsi_p()) == 5)*/) {
+ if (sub_ch == NULL /*&& (usal_sense_key(get_scsi_p()) == 5)*/) {
/* command is not implemented */
ReadSubChannels = NULL;
#if defined DEBUG_SUB
@@ -3042,13 +3042,13 @@
index_list *baseindex_pool;
index_list *last_index_entry;
- SCSI *scgp = get_scsi_p();
+ SCSI *usalp = get_scsi_p();
static struct iterator i;
InitIterator(&i, 1);
- EnableCdda(scgp, 0, 0);
- EnableCdda(scgp, 1, CD_FRAMESIZE_RAW + 16);
+ EnableCdda(usalp, 0, 0);
+ EnableCdda(usalp, 1, CD_FRAMESIZE_RAW + 16);
if (!global.quiet && !(global.verbose & SHOW_INDICES))
fprintf(stderr, "seeking index start ...");
@@ -3212,8 +3212,8 @@
fputs("\n", stderr);
if (playing != 0) StopPlay(get_scsi_p());
- EnableCdda(scgp, 0, 0);
- EnableCdda(scgp, 1, CD_FRAMESIZE_RAW);
+ EnableCdda(usalp, 0, 0);
+ EnableCdda(usalp, 1, CD_FRAMESIZE_RAW);
return retval;
}
Modified: cdrkit/trunk/doc/READMEs/README.cdplus
===================================================================
--- cdrkit/trunk/doc/READMEs/README.cdplus 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/doc/READMEs/README.cdplus 2006-11-23 18:57:28 UTC (rev 430)
@@ -3,8 +3,6 @@
that allows you to that on even on systems that don't support
a sectorsize 2048 Bytes (e.g. SGI IRIX and old versions of Solaris)
or systems that don't support raw device access (e.g. OS/2 W95/W98/WNT).
-This is possible because this hacked version of mkisofs
-uses my scg driver to read the old session from the CD-Recorder.
According to www.cd-info.com, a CD+ is a CD with two sessions.
The first session is an audio session, the second session a data
Modified: cdrkit/trunk/include/AddScgBits.cmake
===================================================================
--- cdrkit/trunk/include/AddScgBits.cmake 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/include/AddScgBits.cmake 2006-11-23 18:57:28 UTC (rev 430)
@@ -3,14 +3,14 @@
SET(GUARD_SCGCONFIG 1)
-LIST(APPEND EXTRA_LIBS "scg")
+LIST(APPEND EXTRA_LIBS "usal")
INCLUDE(CheckIncludeFiles)
CHECK_INCLUDE_FILES("stdio.h;camlib.h" HAVE_CAMLIB_H)
IF(HAVE_CAMLIB_H)
- # quick an dirty, should better become a variable used by libscg only,
+ # quick an dirty, should better become a variable used by libusal only,
# analogous to SCG_SELF_LIBS
ADD_DEFINITIONS(-DHAVE_CAMLIB_H)
Modified: cdrkit/trunk/libhfs_iso/libhfs_iso.com
===================================================================
--- cdrkit/trunk/libhfs_iso/libhfs_iso.com 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/libhfs_iso/libhfs_iso.com 2006-11-23 18:57:28 UTC (rev 430)
@@ -1,7 +1,7 @@
$ defs = "/define=("USE_LARGEFILES","ABORT_DEEP_ISO_ONLY","APPLE_HYB","UDF","DVD_VIDEO","SORTING","USE_LIBSCHILY","USE_SCG","HAVE_DIRENT_H","HAVE_STRCASECMP")
$ incs = "/include=([-.include],[-.libhfs_iso],[-.cdrecord],[])"
$ opts = "/float=ieee/prefix=all"
-$ define/nolog scg [-.LIBSCG.scg]
+$ define/nolog usal [-.LIBSCG.usal]
$ cc 'defs' 'incs' 'opts' BLOCK.C
$ cc 'defs' 'incs' 'opts' BTREE.C
$ cc 'defs' 'incs' 'opts' DATA.C
Modified: cdrkit/trunk/libparanoia/README.interface
===================================================================
--- cdrkit/trunk/libparanoia/README.interface 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/libparanoia/README.interface 2006-11-23 18:57:28 UTC (rev 430)
@@ -59,11 +59,11 @@
qsort
/*--------------------------------------------------------------------------*/
-scgp = scg_open();
-bufsize = scg_bufsize(scgp, CDR_BUF_SIZE);
+usalp = usal_open();
+bufsize = usal_bufsize(usalp, CDR_BUF_SIZE);
nsecs = bufsize / SEC_SIZE;
-cdp = paranoia_init(scgp, nsecs);
+cdp = paranoia_init(usalp, nsecs);
# paranoia_modeset(cdp, mode);
# paranoia_overlapset(cdp, overlap);
Modified: cdrkit/trunk/libschily/libschily.com
===================================================================
--- cdrkit/trunk/libschily/libschily.com 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/libschily/libschily.com 2006-11-23 18:57:28 UTC (rev 430)
@@ -1,4 +1,4 @@
-$ define/nolog scg [-.libscg.scg]
+$ define/nolog usal [-.libusal.usal]
$ set default [-.inc]
$ cc/float=ieee/pref=all/obj/incl=([],[-.include])/define=("VMS") ALIGN_TEST.C
$ link ALIGN_TEST
Modified: cdrkit/trunk/libunls/libunls.com
===================================================================
--- cdrkit/trunk/libunls/libunls.com 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/libunls/libunls.com 2006-11-23 18:57:28 UTC (rev 430)
@@ -1,7 +1,7 @@
$ defs = "/define=("USE_LARGEFILES","ABORT_DEEP_ISO_ONLY","APPLE_HYB","UDF","DVD_VIDEO","SORTING","USE_LIBSCHILY","USE_SCG","HAVE_DIRENT_H","HAVE_STRCASECMP")
$ incs = "/include=([-.include],[-.libhfs_iso],[-.cdrecord],[])"
$ opts = "/float=ieee/prefix=all"
-$ define/nolog scg [-.LIBSCG.scg]
+$ define/nolog usal [-.LIBSCG.usal]
$ cc 'defs' 'incs' 'opts' NLS_BASE.C
$ cc 'defs' 'incs' 'opts' NLS_CONFIG.C
$ cc 'defs' 'incs' 'opts' NLS_CP10000.C
Copied: cdrkit/trunk/libusal (from rev 427, cdrkit/trunk/libscg)
Modified: cdrkit/trunk/libusal/CMakeLists.txt
===================================================================
--- cdrkit/trunk/libscg/CMakeLists.txt 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/CMakeLists.txt 2006-11-23 18:57:28 UTC (rev 430)
@@ -2,8 +2,8 @@
INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR} ../wodim)
include(../include/AddScgBits.cmake)
-#SET(LIBSCG_SRCS rdummy.c scgsettarget.c scgtimes.c scsi-linux-ata.c scsi-linux-pg.c scsi-linux-sg.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c)
-SET(LIBSCG_SRCS scgsettarget.c scgtimes.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c scsi-remote.c)
+#SET(LIBSCG_SRCS rdummy.c usalsettarget.c usaltimes.c scsi-linux-ata.c scsi-linux-pg.c scsi-linux-sg.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c)
+SET(LIBSCG_SRCS usalsettarget.c usaltimes.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c scsi-remote.c)
LINK_DIRECTORIES(../libschily)
-ADD_LIBRARY (scg STATIC ${LIBSCG_SRCS})
-TARGET_LINK_LIBRARIES(scg schily ${SCG_SELF_LIBS})
+ADD_LIBRARY (usal STATIC ${LIBSCG_SRCS})
+TARGET_LINK_LIBRARIES(usal schily ${SCG_SELF_LIBS})
Modified: cdrkit/trunk/libusal/Targets
===================================================================
--- cdrkit/trunk/libscg/Targets 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/Targets 2006-11-23 18:57:28 UTC (rev 430)
@@ -1,3 +1,3 @@
-CFILES= scsitransp.c scsihack.c scsiopen.c scgsettarget.c \
- scsierrs.c scgtimes.c scsihelp.c \
+CFILES= scsitransp.c scsihack.c scsiopen.c usalsettarget.c \
+ scsierrs.c usaltimes.c scsihelp.c \
rdummy.c
Modified: cdrkit/trunk/libusal/libscg-mapvers
===================================================================
--- cdrkit/trunk/libscg/libscg-mapvers 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/libscg-mapvers 2006-11-23 18:57:28 UTC (rev 430)
@@ -1,78 +1,78 @@
SCHILY_1.0 {
global:
- __scg_help;
- __scg_times;
- scg__close;
- scg__errmsg;
- scg__open;
- scg__sprinterr;
- scg_bufsize;
- scg_close;
- scg_cmd;
- scg_cmd_err;
- scg_cmd_status;
- scg_comerr;
- scg_dummy_ops;
- scg_errfflush;
- scg_errflush;
- scg_errmsg;
- scg_exit;
- scg_ferrmsg;
- scg_fprascii;
- scg_fprbytes;
- scg_fprintdev;
- scg_fprinterr;
- scg_fprsense;
- scg_freebuf;
- scg_getbuf;
- scg_getdmacnt;
- scg_getresid;
- scg_havebus;
- scg_help;
- scg_initiator_id;
- scg_isatapi;
- scg_open;
- scg_prascii;
- scg_prbytes;
- scg_printcdb;
- scg_printdev;
- scg_printerr;
- scg_printf;
- scg_printrdata;
- scg_printresult;
- scg_printstatus;
- scg_printwdata;
- scg_prsense;
- scg_remote;
- scg_remote_ops;
- scg_reset;
- scg_sense_code;
- scg_sense_key;
- scg_sense_qual;
- scg_sensemsg;
- scg_serrmsg;
- scg_setnonstderrs;
- scg_settarget;
- scg_settimeout;
- scg_sfree;
- scg_smalloc;
- scg_sprascii;
- scg_sprbytes;
- scg_sprintcdb;
- scg_sprinterr;
- scg_sprintrdata;
- scg_sprintresult;
- scg_sprintstatus;
- scg_sprintwdata;
- scg_sprsense;
- scg_std_ops;
- scg_svhead;
- scg_svtail;
- scg_version;
- scg_vhead;
- scg_vsetup;
- scg_vtail;
- scg_yes;
+ __usal_help;
+ __usal_times;
+ usal__close;
+ usal__errmsg;
+ usal__open;
+ usal__sprinterr;
+ usal_bufsize;
+ usal_close;
+ usal_cmd;
+ usal_cmd_err;
+ usal_cmd_status;
+ usal_comerr;
+ usal_dummy_ops;
+ usal_errfflush;
+ usal_errflush;
+ usal_errmsg;
+ usal_exit;
+ usal_ferrmsg;
+ usal_fprascii;
+ usal_fprbytes;
+ usal_fprintdev;
+ usal_fprinterr;
+ usal_fprsense;
+ usal_freebuf;
+ usal_getbuf;
+ usal_getdmacnt;
+ usal_getresid;
+ usal_havebus;
+ usal_help;
+ usal_initiator_id;
+ usal_isatapi;
+ usal_open;
+ usal_prascii;
+ usal_prbytes;
+ usal_printcdb;
+ usal_printdev;
+ usal_printerr;
+ usal_printf;
+ usal_printrdata;
+ usal_printresult;
+ usal_printstatus;
+ usal_printwdata;
+ usal_prsense;
+ usal_remote;
+ usal_remote_ops;
+ usal_reset;
+ usal_sense_code;
+ usal_sense_key;
+ usal_sense_qual;
+ usal_sensemsg;
+ usal_serrmsg;
+ usal_setnonstderrs;
+ usal_settarget;
+ usal_settimeout;
+ usal_sfree;
+ usal_smalloc;
+ usal_sprascii;
+ usal_sprbytes;
+ usal_sprintcdb;
+ usal_sprinterr;
+ usal_sprintrdata;
+ usal_sprintresult;
+ usal_sprintstatus;
+ usal_sprintwdata;
+ usal_sprsense;
+ usal_std_ops;
+ usal_svhead;
+ usal_svtail;
+ usal_version;
+ usal_vhead;
+ usal_vsetup;
+ usal_vtail;
+ usal_yes;
local:
*;
Modified: cdrkit/trunk/libusal/libscg.com
===================================================================
--- cdrkit/trunk/libscg/libscg.com 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/libscg.com 2006-11-23 18:57:28 UTC (rev 430)
@@ -8,7 +8,7 @@
$ cc 'defs' 'incs' /define=("VMS") SCGSETTARGET.C
$ cc 'defs' 'incs' /define=("VMS") SCGTIMES.C
$ cc 'defs' 'incs' /define=("VMS") rdummy.c
-$ library/crea [-.libs]libscg.olb
-$ library/insert [-.libs]libscg.olb *.obj
+$ library/crea [-.libs]libusal.olb
+$ library/insert [-.libs]libusal.olb *.obj
$ delete *.obj;*
$ purge/nolog [-.libs]*.olb
Modified: cdrkit/trunk/libusal/libscg.mk
===================================================================
--- cdrkit/trunk/libscg/libscg.mk 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/libscg.mk 2006-11-23 18:57:28 UTC (rev 430)
@@ -1,4 +1,4 @@
-#ident @(#)libscg.mk 1.1 05/06/13
+#ident @(#)libusal.mk 1.1 05/06/13
###########################################################################
SRCROOT= ..
RULESDIR= RULES
@@ -8,7 +8,7 @@
#.SEARCHLIST: . $(ARCHDIR) stdio $(ARCHDIR)
#VPATH= .:stdio:$(ARCHDIR)
INSDIR= lib
-TARGETLIB= scg
+TARGETLIB= usal
#CPPOPTS += -Ispecincl
CPPOPTS += -DUSE_PG
include Targets
Modified: cdrkit/trunk/libusal/rdummy.c
===================================================================
--- cdrkit/trunk/libscg/rdummy.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/rdummy.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -16,7 +16,7 @@
"@(#)rdummy.c 1.1 00/08/26 Copyright 2000 J. Schilling";
#endif
/*
- * scg Library
+ * usal Library
* dummy remote ops
*
* Copyright (c) 2000 J. Schilling
@@ -40,14 +40,14 @@
#include <standard.h>
#include <schily.h>
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
-scg_ops_t *scg_remote(void);
+usal_ops_t *usal_remote(void);
-EXPORT scg_ops_t *
-scg_remote()
+EXPORT usal_ops_t *
+usal_remote()
{
-extern scg_ops_t scg_remote_ops;
+extern usal_ops_t usal_remote_ops;
- return (&scg_remote_ops);
+ return (&usal_remote_ops);
}
Modified: cdrkit/trunk/libusal/scg/scgcmd.h
===================================================================
--- cdrkit/trunk/libscg/scg/scgcmd.h 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scg/scgcmd.h 2006-11-23 18:57:28 UTC (rev 430)
@@ -10,11 +10,11 @@
*
*/
-/* @(#)scgcmd.h 2.22 04/09/04 Copyright 1986 J. Schilling */
+/* @(#)usalcmd.h 2.22 04/09/04 Copyright 1986 J. Schilling */
/*
- * Definitions for the SCSI 'scg_cmd' structure that has been created
- * for the SCSI general driver 'scg' for SunOS and Solaris but
- * now is used for wrapping general libscg SCSI transport requests.
+ * Definitions for the SCSI 'usal_cmd' structure that has been created
+ * for the SCSI general driver 'usal' for SunOS and Solaris but
+ * now is used for wrapping general libusal SCSI transport requests.
*
* Copyright (c) 1986 J. Schilling
*/
@@ -52,8 +52,8 @@
# endif
#endif
-#include <scg/scsisense.h>
-#include <scg/scsicdb.h>
+#include <usal/scsisense.h>
+#include <usal/scsicdb.h>
#include <intcvt.h>
#ifdef __cplusplus
@@ -125,7 +125,7 @@
#define DEF_SENSE_LEN 16 /* Default Sense Len */
#define CCS_SENSE_LEN 18 /* Sense Len for CCS compatible devices */
-struct scg_cmd {
+struct usal_cmd {
caddr_t addr; /* Address of data in user space */
int size; /* DMA count for data transfer */
int flags; /* see below for definition */
@@ -138,7 +138,7 @@
/* on driver implementation */
int kdebug; /* driver kernel debug level */
int resid; /* Bytes not transfered */
- int error; /* Error code from scgintr() */
+ int error; /* Error code from usalintr() */
int ux_errno; /* UNIX error code */
#ifdef comment
XXX struct scsi_status scb; ??? /* Status returnd by command */
@@ -161,8 +161,8 @@
/* NOTE: The SCSI target id field */
/* does not need to be filled unless */
/* the low level transport is a real */
- /* scg driver. In this case the low */
- /* level transport routine of libscg */
+ /* usal driver. In this case the low */
+ /* level transport routine of libusal */
/* will fill in the needed value */
union { /* SCSI command descriptor block */
struct scsi_g0cdb g0_cdb;
@@ -175,7 +175,7 @@
#define dma_read flags /* 1 if DMA to Sun, 0 otherwise */
/*
- * definition for flags field in scg_cmd struct
+ * definition for flags field in usal_cmd struct
*/
#define SCG_RECV_DATA 0x0001 /* DMA direction to Sun */
#define SCG_DISRE_ENA 0x0002 /* enable disconnect/reconnect */
@@ -184,7 +184,7 @@
#define SCG_NOPARITY 0x0010 /* disable parity for this command */
/*
- * definition for error field in scg_cmd struct
+ * definition for error field in usal_cmd struct
*
* The codes refer to SCSI general errors, not to device
* specific errors. Device specific errors are discovered
Modified: cdrkit/trunk/libusal/scg/scgio.h
===================================================================
--- cdrkit/trunk/libscg/scg/scgio.h 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scg/scgio.h 2006-11-23 18:57:28 UTC (rev 430)
@@ -10,9 +10,9 @@
*
*/
-/* @(#)scgio.h 2.16 00/11/07 Copyright 1986 J. Schilling */
+/* @(#)usalio.h 2.16 00/11/07 Copyright 1986 J. Schilling */
/*
- * Definitions for the SCSI general driver 'scg'
+ * Definitions for the SCSI general driver 'usal'
*
* Copyright (c) 1986 J. Schilling
*/
@@ -35,7 +35,7 @@
#define _SCG_SCGIO_H
#ifndef _SCG_SCGCMD_H
-#include <scg/scgcmd.h>
+#include <usal/usalcmd.h>
#endif
#if defined(SVR4)
@@ -47,7 +47,7 @@
#endif
#if defined(__STDC__) || defined(SVR4)
-#define SCGIOCMD _IOWR('G', 1, struct scg_cmd) /* do a SCSI cmd */
+#define SCGIOCMD _IOWR('G', 1, struct usal_cmd) /* do a SCSI cmd */
#define SCGIORESET _IO('G', 2) /* reset SCSI bus */
#define SCGIOGDISRE _IOR('G', 4, int) /* get sc disre Val*/
#define SCGIOSDISRE _IOW('G', 5, int) /* set sc disre Val*/
@@ -58,7 +58,7 @@
#define SCIOGDBG _IOR('G', 104, int) /* get sc Debug Val*/
#define SCIOSDBG _IOW('G', 105, int) /* set sc Debug Val*/
#else
-#define SCGIOCMD _IOWR(G, 1, struct scg_cmd) /* do a SCSI cmd */
+#define SCGIOCMD _IOWR(G, 1, struct usal_cmd) /* do a SCSI cmd */
#define SCGIORESET _IO(G, 2) /* reset SCSI bus */
#define SCGIOGDISRE _IOR(G, 4, int) /* get sc disre Val*/
#define SCGIOSDISRE _IOW(G, 5, int) /* set sc disre Val*/
Modified: cdrkit/trunk/libusal/scg/scgops.h
===================================================================
--- cdrkit/trunk/libscg/scg/scgops.h 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scg/scgops.h 2006-11-23 18:57:28 UTC (rev 430)
@@ -10,7 +10,7 @@
*
*/
-/* @(#)scgops.h 1.5 02/10/19 Copyright 2000 J. Schilling */
+/* @(#)usalops.h 1.5 02/10/19 Copyright 2000 J. Schilling */
/*
* Copyright (c) 2000 J. Schilling
*/
@@ -36,42 +36,42 @@
extern "C" {
#endif
-typedef struct scg_ops {
- int (*scgo_send)(SCSI *scgp);
+typedef struct usal_ops {
+ int (*usalo_send)(SCSI *usalp);
- char * (*scgo_version)(SCSI *scgp, int what);
+ char * (*usalo_version)(SCSI *usalp, int what);
#ifdef EOF /* stdio.h has been included */
- int (*scgo_help)(SCSI *scgp, FILE *f);
+ int (*usalo_help)(SCSI *usalp, FILE *f);
#else
- int (*scgo_help)(SCSI *scgp, void *f);
+ int (*usalo_help)(SCSI *usalp, void *f);
#endif
- int (*scgo_open)(SCSI *scgp, char *device);
- int (*scgo_close)(SCSI *scgp);
- long (*scgo_maxdma)(SCSI *scgp, long amt);
- void * (*scgo_getbuf)(SCSI *scgp, long amt);
- void (*scgo_freebuf)(SCSI *scgp);
+ int (*usalo_open)(SCSI *usalp, char *device);
+ int (*usalo_close)(SCSI *usalp);
+ long (*usalo_maxdma)(SCSI *usalp, long amt);
+ void * (*usalo_getbuf)(SCSI *usalp, long amt);
+ void (*usalo_freebuf)(SCSI *usalp);
- BOOL (*scgo_havebus)(SCSI *scgp, int busno);
- int (*scgo_fileno)(SCSI *scgp, int busno, int tgt, int tlun);
- int (*scgo_initiator_id)(SCSI *scgp);
- int (*scgo_isatapi)(SCSI *scgp);
- int (*scgo_reset)(SCSI *scgp, int what);
-} scg_ops_t;
+ BOOL (*usalo_havebus)(SCSI *usalp, int busno);
+ int (*usalo_fileno)(SCSI *usalp, int busno, int tgt, int tlun);
+ int (*usalo_initiator_id)(SCSI *usalp);
+ int (*usalo_isatapi)(SCSI *usalp);
+ int (*usalo_reset)(SCSI *usalp, int what);
+} usal_ops_t;
-#define SCGO_SEND(scgp) (*(scgp)->ops->scgo_send)(scgp)
-#define SCGO_VERSION(scgp, what) (*(scgp)->ops->scgo_version)(scgp, what)
-#define SCGO_HELP(scgp, f) (*(scgp)->ops->scgo_help)(scgp, f)
-#define SCGO_OPEN(scgp, device) (*(scgp)->ops->scgo_open)(scgp, device)
-#define SCGO_CLOSE(scgp) (*(scgp)->ops->scgo_close)(scgp)
-#define SCGO_MAXDMA(scgp, amt) (*(scgp)->ops->scgo_maxdma)(scgp, amt)
-#define SCGO_GETBUF(scgp, amt) (*(scgp)->ops->scgo_getbuf)(scgp, amt)
-#define SCGO_FREEBUF(scgp) (*(scgp)->ops->scgo_freebuf)(scgp)
-#define SCGO_HAVEBUS(scgp, busno) (*(scgp)->ops->scgo_havebus)(scgp, busno)
-#define SCGO_FILENO(scgp, busno, tgt, tlun) (*(scgp)->ops->scgo_fileno)(scgp, busno, tgt, tlun)
-#define SCGO_INITIATOR_ID(scgp) (*(scgp)->ops->scgo_initiator_id)(scgp)
-#define SCGO_ISATAPI(scgp) (*(scgp)->ops->scgo_isatapi)(scgp)
-#define SCGO_RESET(scgp, what) (*(scgp)->ops->scgo_reset)(scgp, what)
+#define SCGO_SEND(usalp) (*(usalp)->ops->usalo_send)(usalp)
+#define SCGO_VERSION(usalp, what) (*(usalp)->ops->usalo_version)(usalp, what)
+#define SCGO_HELP(usalp, f) (*(usalp)->ops->usalo_help)(usalp, f)
+#define SCGO_OPEN(usalp, device) (*(usalp)->ops->usalo_open)(usalp, device)
+#define SCGO_CLOSE(usalp) (*(usalp)->ops->usalo_close)(usalp)
+#define SCGO_MAXDMA(usalp, amt) (*(usalp)->ops->usalo_maxdma)(usalp, amt)
+#define SCGO_GETBUF(usalp, amt) (*(usalp)->ops->usalo_getbuf)(usalp, amt)
+#define SCGO_FREEBUF(usalp) (*(usalp)->ops->usalo_freebuf)(usalp)
+#define SCGO_HAVEBUS(usalp, busno) (*(usalp)->ops->usalo_havebus)(usalp, busno)
+#define SCGO_FILENO(usalp, busno, tgt, tlun) (*(usalp)->ops->usalo_fileno)(usalp, busno, tgt, tlun)
+#define SCGO_INITIATOR_ID(usalp) (*(usalp)->ops->usalo_initiator_id)(usalp)
+#define SCGO_ISATAPI(usalp) (*(usalp)->ops->usalo_isatapi)(usalp)
+#define SCGO_RESET(usalp, what) (*(usalp)->ops->usalo_reset)(usalp, what)
#ifdef __cplusplus
}
Modified: cdrkit/trunk/libusal/scg/scsitransp.h
===================================================================
--- cdrkit/trunk/libscg/scg/scsitransp.h 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scg/scsitransp.h 2006-11-23 18:57:28 UTC (rev 430)
@@ -38,25 +38,25 @@
extern "C" {
#endif
-typedef struct scg_scsi SCSI;
+typedef struct usal_scsi SCSI;
typedef struct {
int scsibus; /* SCSI bus # for next I/O */
int target; /* SCSI target # for next I/O */
int lun; /* SCSI lun # for next I/O */
-} scg_addr_t;
+} usal_addr_t;
#ifndef _SCG_SCGOPS_H
-#include <scg/scgops.h>
+#include <usal/usalops.h>
#endif
-typedef int (*scg_cb_t)(void *);
+typedef int (*usal_cb_t)(void *);
-struct scg_scsi {
- scg_ops_t *ops; /* Ptr to low level SCSI transport ops */
+struct usal_scsi {
+ usal_ops_t *ops; /* Ptr to low level SCSI transport ops */
int fd; /* File descriptor for next I/O */
- scg_addr_t addr; /* SCSI address for next I/O */
- int flags; /* Libscg flags (see below) */
+ usal_addr_t addr; /* SCSI address for next I/O */
+ int flags; /* Libusal flags (see below) */
int dflags; /* Drive specific flags (see below) */
int kdebug; /* Kernel debug value for next I/O */
int debug; /* Debug value for SCSI library */
@@ -67,11 +67,11 @@
int deftimeout;
int noparity; /* Do not use SCSI parity fo next I/O */
int dev; /* from scsi_cdr.c */
- struct scg_cmd *scmd;
+ struct usal_cmd *scmd;
char *cmdname;
char *curcmdname;
BOOL running;
- int error; /* libscg error number */
+ int error; /* libusal error number */
long maxdma; /* Max DMA limit for this open instance */
long maxbuf; /* Cur DMA buffer limit for this inst. */
@@ -87,7 +87,7 @@
char *errptr; /* Actual write pointer into errstr */
void *errfile; /* FILE to write errors to. NULL for not*/
/* writing and leaving errs in errstr */
- scg_cb_t cb_fun;
+ usal_cb_t cb_fun;
void *cb_arg;
struct scsi_inquiry *inq;
@@ -95,13 +95,13 @@
};
/*
- * Macros for accessing members of the scg address structure.
- * scg_settarget() is the only function that is allowed to modify
+ * Macros for accessing members of the usal address structure.
+ * usal_settarget() is the only function that is allowed to modify
* the values of the SCSI address.
*/
-#define scg_scsibus(scgp) (scgp)->addr.scsibus
-#define scg_target(scgp) (scgp)->addr.target
-#define scg_lun(scgp) (scgp)->addr.lun
+#define usal_scsibus(usalp) (usalp)->addr.scsibus
+#define usal_target(usalp) (usalp)->addr.target
+#define usal_lun(usalp) (usalp)->addr.lun
/*
* Flags for struct SCSI:
@@ -117,15 +117,15 @@
#define SCSI_ERRSTR_SIZE 4096
/*
- * Libscg error codes:
+ * Libusal error codes:
*/
#define SCG_ERRBASE 1000000
#define SCG_NOMEM 1000001
/*
- * Function codes for scg_version():
+ * Function codes for usal_version():
*/
-#define SCG_VERSION 0 /* libscg or transport version */
+#define SCG_VERSION 0 /* libusal or transport version */
#define SCG_AUTHOR 1 /* Author of above */
#define SCG_SCCS_ID 2 /* SCCS id of above */
#define SCG_RVERSION 10 /* Remote transport version */
@@ -134,7 +134,7 @@
#define SCG_KVERSION 20 /* Kernel transport version */
/*
- * Function codes for scg_reset():
+ * Function codes for usal_reset():
*/
#define SCG_RESET_NOP 0 /* Test if reset is supported */
#define SCG_RESET_TGT 1 /* Reset Target only */
@@ -143,85 +143,85 @@
/*
* Helpers for the error buffer in SCSI*
*/
-#define scg_errsize(scgp) ((scgp)->errptr - (scgp)->errstr)
-#define scg_errrsize(scgp) (SCSI_ERRSTR_SIZE - scg_errsize(scgp))
+#define usal_errsize(usalp) ((usalp)->errptr - (usalp)->errstr)
+#define usal_errrsize(usalp) (SCSI_ERRSTR_SIZE - usal_errsize(usalp))
/*
* From scsitransp.c:
*/
-extern char *scg_version(SCSI *scgp, int what);
-extern int scg__open(SCSI *scgp, char *device);
-extern int scg__close(SCSI *scgp);
-extern BOOL scg_havebus(SCSI *scgp, int);
-extern int scg_initiator_id(SCSI *scgp);
-extern int scg_isatapi(SCSI *scgp);
-extern int scg_reset(SCSI *scgp, int what);
-extern void *scg_getbuf(SCSI *scgp, long);
-extern void scg_freebuf(SCSI *scgp);
-extern long scg_bufsize(SCSI *scgp, long);
-extern void scg_setnonstderrs(SCSI *scgp, const char **);
-extern BOOL scg_yes(char *);
-extern int scg_cmd(SCSI *scgp);
-extern void scg_vhead(SCSI *scgp);
-extern int scg_svhead(SCSI *scgp, char *buf, int maxcnt);
-extern int scg_vtail(SCSI *scgp);
-extern int scg_svtail(SCSI *scgp, int *retp, char *buf, int maxcnt);
-extern void scg_vsetup(SCSI *scgp);
-extern int scg_getresid(SCSI *scgp);
-extern int scg_getdmacnt(SCSI *scgp);
-extern BOOL scg_cmd_err(SCSI *scgp);
-extern void scg_printerr(SCSI *scgp);
+extern char *usal_version(SCSI *usalp, int what);
+extern int usal__open(SCSI *usalp, char *device);
+extern int usal__close(SCSI *usalp);
+extern BOOL usal_havebus(SCSI *usalp, int);
+extern int usal_initiator_id(SCSI *usalp);
+extern int usal_isatapi(SCSI *usalp);
+extern int usal_reset(SCSI *usalp, int what);
+extern void *usal_getbuf(SCSI *usalp, long);
+extern void usal_freebuf(SCSI *usalp);
+extern long usal_bufsize(SCSI *usalp, long);
+extern void usal_setnonstderrs(SCSI *usalp, const char **);
+extern BOOL usal_yes(char *);
+extern int usal_cmd(SCSI *usalp);
+extern void usal_vhead(SCSI *usalp);
+extern int usal_svhead(SCSI *usalp, char *buf, int maxcnt);
+extern int usal_vtail(SCSI *usalp);
+extern int usal_svtail(SCSI *usalp, int *retp, char *buf, int maxcnt);
+extern void usal_vsetup(SCSI *usalp);
+extern int usal_getresid(SCSI *usalp);
+extern int usal_getdmacnt(SCSI *usalp);
+extern BOOL usal_cmd_err(SCSI *usalp);
+extern void usal_printerr(SCSI *usalp);
#ifdef EOF /* stdio.h has been included */
-extern void scg_fprinterr(SCSI *scgp, FILE *f);
+extern void usal_fprinterr(SCSI *usalp, FILE *f);
#endif
-extern int scg_sprinterr(SCSI *scgp, char *buf, int maxcnt);
-extern int scg__sprinterr(SCSI *scgp, char *buf, int maxcnt);
-extern void scg_printcdb(SCSI *scgp);
-extern int scg_sprintcdb(SCSI *scgp, char *buf, int maxcnt);
-extern void scg_printwdata(SCSI *scgp);
-extern int scg_sprintwdata(SCSI *scgp, char *buf, int maxcnt);
-extern void scg_printrdata(SCSI *scgp);
-extern int scg_sprintrdata(SCSI *scgp, char *buf, int maxcnt);
-extern void scg_printresult(SCSI *scgp);
-extern int scg_sprintresult(SCSI *scgp, char *buf, int maxcnt);
-extern void scg_printstatus(SCSI *scgp);
-extern int scg_sprintstatus(SCSI *scgp, char *buf, int maxcnt);
+extern int usal_sprinterr(SCSI *usalp, char *buf, int maxcnt);
+extern int usal__sprinterr(SCSI *usalp, char *buf, int maxcnt);
+extern void usal_printcdb(SCSI *usalp);
+extern int usal_sprintcdb(SCSI *usalp, char *buf, int maxcnt);
+extern void usal_printwdata(SCSI *usalp);
+extern int usal_sprintwdata(SCSI *usalp, char *buf, int maxcnt);
+extern void usal_printrdata(SCSI *usalp);
+extern int usal_sprintrdata(SCSI *usalp, char *buf, int maxcnt);
+extern void usal_printresult(SCSI *usalp);
+extern int usal_sprintresult(SCSI *usalp, char *buf, int maxcnt);
+extern void usal_printstatus(SCSI *usalp);
+extern int usal_sprintstatus(SCSI *usalp, char *buf, int maxcnt);
#ifdef EOF /* stdio.h has been included */
-extern void scg_fprbytes(FILE *, char *, unsigned char *, int);
-extern void scg_fprascii(FILE *, char *, unsigned char *, int);
+extern void usal_fprbytes(FILE *, char *, unsigned char *, int);
+extern void usal_fprascii(FILE *, char *, unsigned char *, int);
#endif
-extern void scg_prbytes(char *, unsigned char *, int);
-extern void scg_prascii(char *, unsigned char *, int);
-extern int scg_sprbytes(char *buf, int maxcnt, char *, unsigned char *, int);
-extern int scg_sprascii(char *buf, int maxcnt, char *, unsigned char *, int);
+extern void usal_prbytes(char *, unsigned char *, int);
+extern void usal_prascii(char *, unsigned char *, int);
+extern int usal_sprbytes(char *buf, int maxcnt, char *, unsigned char *, int);
+extern int usal_sprascii(char *buf, int maxcnt, char *, unsigned char *, int);
#ifdef EOF /* stdio.h has been included */
-extern void scg_fprsense(FILE *f, unsigned char *, int);
+extern void usal_fprsense(FILE *f, unsigned char *, int);
#endif
-extern void scg_prsense(unsigned char *, int);
-extern int scg_sprsense(char *buf, int maxcnt, unsigned char *, int);
-extern int scg_cmd_status(SCSI *scgp);
-extern int scg_sense_key(SCSI *scgp);
-extern int scg_sense_code(SCSI *scgp);
-extern int scg_sense_qual(SCSI *scgp);
+extern void usal_prsense(unsigned char *, int);
+extern int usal_sprsense(char *buf, int maxcnt, unsigned char *, int);
+extern int usal_cmd_status(SCSI *usalp);
+extern int usal_sense_key(SCSI *usalp);
+extern int usal_sense_code(SCSI *usalp);
+extern int usal_sense_qual(SCSI *usalp);
#ifdef _SCG_SCSIREG_H
#ifdef EOF /* stdio.h has been included */
-extern void scg_fprintdev(FILE *, struct scsi_inquiry *);
+extern void usal_fprintdev(FILE *, struct scsi_inquiry *);
#endif
-extern void scg_printdev(struct scsi_inquiry *);
+extern void usal_printdev(struct scsi_inquiry *);
#endif
-extern int scg_printf(SCSI *scgp, const char *form, ...);
-extern int scg_errflush(SCSI *scgp);
+extern int usal_printf(SCSI *usalp, const char *form, ...);
+extern int usal_errflush(SCSI *usalp);
#ifdef EOF /* stdio.h has been included */
-extern int scg_errfflush(SCSI *scgp, FILE *f);
+extern int usal_errfflush(SCSI *usalp, FILE *f);
#endif
/*
* From scsierrmsg.c:
*/
-extern const char *scg_sensemsg(int, int, int, const char **, char *,
+extern const char *usal_sensemsg(int, int, int, const char **, char *,
int maxcnt);
#ifdef _SCG_SCSISENSE_H
-extern int scg__errmsg(SCSI *scgp, char *obuf, int maxcnt,
+extern int usal__errmsg(SCSI *usalp, char *obuf, int maxcnt,
struct scsi_sense *, struct scsi_status *, int);
#endif
@@ -229,30 +229,30 @@
* From scsiopen.c:
*/
#ifdef EOF /* stdio.h has been included */
-extern int scg_help(FILE *f);
+extern int usal_help(FILE *f);
#endif
-extern SCSI *scg_open(char *scsidev, char *errs, int slen, int odebug,
+extern SCSI *usal_open(char *scsidev, char *errs, int slen, int odebug,
int be_verbose);
-extern int scg_close(SCSI * scgp);
-extern void scg_settimeout(SCSI * scgp, int timeout);
-extern SCSI *scg_smalloc(void);
-extern void scg_sfree(SCSI *scgp);
+extern int usal_close(SCSI * usalp);
+extern void usal_settimeout(SCSI * usalp, int timeout);
+extern SCSI *usal_smalloc(void);
+extern void usal_sfree(SCSI *usalp);
/*
- * From scgsettarget.c:
+ * From usalsettarget.c:
*/
-extern int scg_settarget(SCSI *scgp, int scsibus, int target, int lun);
+extern int usal_settarget(SCSI *usalp, int scsibus, int target, int lun);
/*
* From scsi-remote.c:
*/
-extern scg_ops_t *scg_remote(void);
+extern usal_ops_t *usal_remote(void);
/*
* From scsihelp.c:
*/
#ifdef EOF /* stdio.h has been included */
-extern void __scg_help(FILE *f, char *name, char *tcomment, char *tind,
+extern void __usal_help(FILE *f, char *name, char *tcomment, char *tind,
char *tspec, char *texample, BOOL mayscan,
BOOL bydev);
#endif
Modified: cdrkit/trunk/libusal/scgsettarget.c
===================================================================
--- cdrkit/trunk/libscg/scgsettarget.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scgsettarget.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -10,17 +10,17 @@
*
*/
-/* @(#)scgsettarget.c 1.2 04/01/14 Copyright 2000 J. Schilling */
+/* @(#)usalsettarget.c 1.2 04/01/14 Copyright 2000 J. Schilling */
#ifndef lint
static char _sccsid[] =
- "@(#)scgsettarget.c 1.2 04/01/14 Copyright 2000 J. Schilling";
+ "@(#)usalsettarget.c 1.2 04/01/14 Copyright 2000 J. Schilling";
#endif
/*
- * scg Library
+ * usal Library
* set target SCSI address
*
- * This is the only place in libscg that is allowed to assign
- * values to the scg address structure.
+ * This is the only place in libusal that is allowed to assign
+ * values to the usal address structure.
*
* Copyright (c) 2000 J. Schilling
*/
@@ -43,20 +43,20 @@
#include <standard.h>
#include <schily.h>
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
-int scg_settarget(SCSI *scgp, int, int, int);
+int usal_settarget(SCSI *usalp, int, int, int);
int
-scg_settarget(SCSI *scgp, int busno, int tgt, int tlun)
+usal_settarget(SCSI *usalp, int busno, int tgt, int tlun)
{
int fd = -1;
- if (scgp->ops != NULL)
- fd = SCGO_FILENO(scgp, busno, tgt, tlun);
- scgp->fd = fd;
- scg_scsibus(scgp) = busno;
- scg_target(scgp) = tgt;
- scg_lun(scgp) = tlun;
+ if (usalp->ops != NULL)
+ fd = SCGO_FILENO(usalp, busno, tgt, tlun);
+ usalp->fd = fd;
+ usal_scsibus(usalp) = busno;
+ usal_target(usalp) = tgt;
+ usal_lun(usalp) = tlun;
return (fd);
}
Modified: cdrkit/trunk/libusal/scgtimes.c
===================================================================
--- cdrkit/trunk/libscg/scgtimes.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scgtimes.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -10,10 +10,10 @@
*
*/
-/* @(#)scgtimes.c 1.1 00/08/25 Copyright 1995,2000 J. Schilling */
+/* @(#)usaltimes.c 1.1 00/08/25 Copyright 1995,2000 J. Schilling */
#ifndef lint
static char sccsid[] =
- "@(#)scgtimes.c 1.1 00/08/25 Copyright 1995,2000 J. Schilling";
+ "@(#)usaltimes.c 1.1 00/08/25 Copyright 1995,2000 J. Schilling";
#endif
/*
* SCSI user level command timing
@@ -40,23 +40,23 @@
#include <timedefs.h>
#include <schily.h>
-#include <scg/scsitransp.h>
-#include "scgtimes.h"
+#include <usal/scsitransp.h>
+#include "usaltimes.h"
-void __scg_times(SCSI *scgp);
+void __usal_times(SCSI *usalp);
/*
* We don't like to make this a public interface to prevent bad users
* from making our timing incorrect.
*/
void
-__scg_times(SCSI *scgp)
+__usal_times(SCSI *usalp)
{
- struct timeval *stp = scgp->cmdstop;
+ struct timeval *stp = usalp->cmdstop;
gettimeofday(stp, (struct timezone *)0);
- stp->tv_sec -= scgp->cmdstart->tv_sec;
- stp->tv_usec -= scgp->cmdstart->tv_usec;
+ stp->tv_sec -= usalp->cmdstart->tv_sec;
+ stp->tv_usec -= usalp->cmdstart->tv_usec;
while (stp->tv_usec < 0) {
stp->tv_sec -= 1;
stp->tv_usec += 1000000;
Modified: cdrkit/trunk/libusal/scgtimes.h
===================================================================
--- cdrkit/trunk/libscg/scgtimes.h 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scgtimes.h 2006-11-23 18:57:28 UTC (rev 430)
@@ -10,7 +10,7 @@
*
*/
-/* @(#)scgtimes.h 1.1 00/08/25 Copyright 1995,2000 J. Schilling */
+/* @(#)usaltimes.h 1.1 00/08/25 Copyright 1995,2000 J. Schilling */
/*
* SCSI user level command timing
*
@@ -31,4 +31,4 @@
* Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-extern void __scg_times(SCSI *scgp);
+extern void __usal_times(SCSI *usalp);
Modified: cdrkit/trunk/libusal/scsi-aix.c
===================================================================
--- cdrkit/trunk/libscg/scsi-aix.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-aix.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -19,10 +19,10 @@
* Interface for the AIX generic SCSI implementation.
*
* This is a hack, that tries to emulate the functionality
- * of the scg driver.
+ * of the usal driver.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -48,27 +48,27 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-aix.c-1.36"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-aix.c-1.36"; /* The version for this transport*/
#define MAX_SCG 16 /* Max # of SCSI controllers */
#define MAX_TGT 16
#define MAX_LUN 8
-struct scg_local{
- short scgfiles[MAX_SCG][MAX_TGT][MAX_LUN];
+struct usal_local{
+ short usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
};
-#define scglocal(p) ((struct scg_local*)((p)->local))
+#define usallocal(p) ((struct usal_local*)((p)->local))
#define MAX_DMA_AIX (64*1024)
-static int do_scg_cmd(SCSI *scgp, struct scg_cmd *sp);
-static int do_scg_sense(SCSI *scgp, struct scg_cmd *sp);
+static int do_usal_cmd(SCSI *usalp, struct usal_cmd *sp);
+static int do_usal_sense(SCSI *usalp, struct usal_cmd *sp);
/*
* Return version information for the low level SCSI transport code.
@@ -76,19 +76,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -97,19 +97,19 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "DKIOCMD", "SCSI transport for targets known by AIX drivers",
+ __usal_help(f, "DKIOCMD", "SCSI transport for targets known by AIX drivers",
"", "bus,target,lun or UNIX device", "1,2,0 or /dev/rcd0@", FALSE, TRUE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
register int f;
register int b;
register int t;
@@ -119,22 +119,22 @@
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -147,17 +147,17 @@
js_snprintf(devname, sizeof (devname), "/dev/rcd%d", tgt);
f = openx(devname, 0, 0, SC_DIAGNOSTIC);
if (f < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'. Specify device number (1 for cd1) as target (1,0)",
devname);
return (0);
}
- scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
+ usallocal(usalp)->usalfiles[busno][tgt][tlun] = f;
return (1);
} else {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Unable to scan on AIX");
return (0);
}
@@ -165,15 +165,15 @@
if (device != NULL && *device != '\0' && busno >= 0 && tgt >= 0 && tlun >= 0) {
f = openx(device, 0, 0, SC_DIAGNOSTIC);
if (f < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'",
devname);
return (0);
}
- scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
- scg_settarget(scgp, busno, tgt, tlun);
+ usallocal(usalp)->usalfiles[busno][tgt][tlun] = f;
+ usal_settarget(usalp, busno, tgt, tlun);
return (++nopen);
}
@@ -181,23 +181,23 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
register int f;
register int b;
register int t;
register int l;
- if (scgp->local== NULL)
+ if (usalp->local== NULL)
return (-1);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- f = scglocal(scgp)->scgfiles[b][t][l];
+ f = usallocal(usalp)->usalfiles[b][t][l];
if (f >= 0)
close(f);
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -205,7 +205,7 @@
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
return (MAX_DMA_AIX);
}
@@ -213,7 +213,7 @@
#define palign(x, a) (((char *)(x)) + ((a) - 1 - (((UIntptr_t)((x)-1))%(a))))
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
void *ret;
int pagesize;
@@ -224,14 +224,14 @@
pagesize = getpagesize();
#endif
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
/*
* Damn AIX is a paged system but has no valloc()
*/
- scgp->bufbase = ret = malloc((size_t)(amt+pagesize));
+ usalp->bufbase = ret = malloc((size_t)(amt+pagesize));
if (ret == NULL)
return (ret);
ret = palign(ret, pagesize);
@@ -239,15 +239,15 @@
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
register int t;
register int l;
@@ -255,45 +255,45 @@
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- if (scglocal(scgp)->scgfiles[busno][t][l] >= 0)
+ if (usallocal(usalp)->usalfiles[busno][t][l] >= 0)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((int)scglocal(scgp)->scgfiles[busno][tgt][tlun]);
+ return ((int)usallocal(usalp)->usalfiles[busno][tgt][tlun]);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (FALSE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
if (what == SCG_RESET_NOP)
return (0);
@@ -304,11 +304,11 @@
/*
* XXX Does this reset TGT or BUS ???
*/
- return (ioctl(scgp->fd, SCIORESET, IDLUN(scg_target(scgp), scg_lun(scgp))));
+ return (ioctl(usalp->fd, SCIORESET, IDLUN(usal_target(usalp), usal_lun(usalp))));
}
static int
-do_scg_cmd(SCSI *scgp, struct scg_cmd *sp)
+do_usal_cmd(SCSI *usalp, struct usal_cmd *sp)
{
struct sc_iocmd req;
int ret;
@@ -331,19 +331,19 @@
movebytes(&sp->cdb, req.scsi_cdb, 12);
errno = 0;
- ret = ioctl(scgp->fd, DKIOCMD, &req);
+ ret = ioctl(usalp->fd, DKIOCMD, &req);
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile, "ret: %d errno: %d (%s)\n", ret, errno, errmsgstr(errno));
- js_fprintf((FILE *)scgp->errfile, "data_length: %d\n", req.data_length);
- js_fprintf((FILE *)scgp->errfile, "buffer: 0x%X\n", req.buffer);
- js_fprintf((FILE *)scgp->errfile, "timeout_value: %d\n", req.timeout_value);
- js_fprintf((FILE *)scgp->errfile, "status_validity: %d\n", req.status_validity);
- js_fprintf((FILE *)scgp->errfile, "scsi_bus_status: 0x%X\n", req.scsi_bus_status);
- js_fprintf((FILE *)scgp->errfile, "adapter_status: 0x%X\n", req.adapter_status);
- js_fprintf((FILE *)scgp->errfile, "adap_q_status: 0x%X\n", req.adap_q_status);
- js_fprintf((FILE *)scgp->errfile, "q_tag_msg: 0x%X\n", req.q_tag_msg);
- js_fprintf((FILE *)scgp->errfile, "flags: 0X%X\n", req.flags);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile, "ret: %d errno: %d (%s)\n", ret, errno, errmsgstr(errno));
+ js_fprintf((FILE *)usalp->errfile, "data_length: %d\n", req.data_length);
+ js_fprintf((FILE *)usalp->errfile, "buffer: 0x%X\n", req.buffer);
+ js_fprintf((FILE *)usalp->errfile, "timeout_value: %d\n", req.timeout_value);
+ js_fprintf((FILE *)usalp->errfile, "status_validity: %d\n", req.status_validity);
+ js_fprintf((FILE *)usalp->errfile, "scsi_bus_status: 0x%X\n", req.scsi_bus_status);
+ js_fprintf((FILE *)usalp->errfile, "adapter_status: 0x%X\n", req.adapter_status);
+ js_fprintf((FILE *)usalp->errfile, "adap_q_status: 0x%X\n", req.adap_q_status);
+ js_fprintf((FILE *)usalp->errfile, "q_tag_msg: 0x%X\n", req.q_tag_msg);
+ js_fprintf((FILE *)usalp->errfile, "flags: 0X%X\n", req.flags);
}
if (ret < 0) {
sp->ux_errno = geterrno();
@@ -388,10 +388,10 @@
}
static int
-do_scg_sense(SCSI *scgp, struct scg_cmd *sp)
+do_usal_sense(SCSI *usalp, struct usal_cmd *sp)
{
int ret;
- struct scg_cmd s_cmd;
+ struct usal_cmd s_cmd;
fillbytes((caddr_t)&s_cmd, sizeof (s_cmd), '\0');
s_cmd.addr = sp->u_sense.cmd_sense;
@@ -402,7 +402,7 @@
s_cmd.cdb.g0_cdb.cmd = SC_REQUEST_SENSE;
s_cmd.cdb.g0_cdb.lun = sp->cdb.g0_cdb.lun;
s_cmd.cdb.g0_cdb.count = sp->sense_len;
- ret = do_scg_cmd(scgp, &s_cmd);
+ ret = do_usal_cmd(usalp, &s_cmd);
if (ret < 0)
return (ret);
@@ -414,19 +414,19 @@
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
int ret;
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
- ret = do_scg_cmd(scgp, sp);
+ ret = do_usal_cmd(usalp, sp);
if (ret < 0)
return (ret);
if (sp->u_scb.cmd_scb[0] & 02)
- ret = do_scg_sense(scgp, sp);
+ ret = do_usal_sense(usalp, sp);
return (ret);
}
Modified: cdrkit/trunk/libusal/scsi-amigaos.c
===================================================================
--- cdrkit/trunk/libscg/scsi-amigaos.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-amigaos.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -19,7 +19,7 @@
* Interface for the AmigaOS generic SCSI implementation.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -58,24 +58,24 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-amigaos.c-1.6"; /* The version for this transport */
-static char _scg_auth[] = "T. Langer";
+static char _usal_trans_version[] = "scsi-amigaos.c-1.6"; /* The version for this transport */
+static char _usal_auth[] = "T. Langer";
#define MAX_SCG 8 /* Max # of SCSI controllers */
#define MAX_TGT 8
#define MAX_LUN 8
#define MAX_DEV MAX_SCG*MAX_TGT*MAX_LUN
-struct scg_local{
- int scgfiles[MAX_SCG][MAX_TGT][MAX_LUN];
+struct usal_local{
+ int usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
};
-#define scglocal(p) ((struct scg_local*)((p)->local))
+#define usallocal(p) ((struct usal_local*)((p)->local))
#define MAX_DMA_AMIGAOS (64*1024)
@@ -99,7 +99,7 @@
#define DUNIT(b, t, l) (100 * b) + (10 * (l < 0 ? 0:l)) + t
static void amiga_init(void);
-static int amiga_open_scsi(int bus, int tgt, int lun, SCSI *scgp);
+static int amiga_open_scsi(int bus, int tgt, int lun, SCSI *usalp);
static void amiga_close_scsi(int fd);
static void amiga_close_scsi_all(void);
static void amiga_scan_devices(void);
@@ -114,20 +114,20 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
-/* return (_scg_auth_cdrkit);*/
- return (_scg_auth);
+/* return (_usal_auth_cdrkit);*/
+ return (_usal_auth);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -136,19 +136,19 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "Amiga SCSI", "Generic SCSI",
+ __usal_help(f, "Amiga SCSI", "Generic SCSI",
"", "bus,target,lun or xxx.device:b,t,l", "1,2,0 or scsi.device:1,2,0", TRUE, FALSE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
register int f;
register int b;
register int t;
@@ -162,22 +162,22 @@
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr) {
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
}
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- scglocal(scgp)->scgfiles[b][t][l] = -1;
+ usallocal(usalp)->usalfiles[b][t][l] = -1;
}
}
}
@@ -186,7 +186,7 @@
if (device == NULL || *device == '\0') {
if (last_bus == -1) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"No scsi device found");
return (-1);
}
@@ -195,9 +195,9 @@
for (b = 0; b <= last_bus; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- f = amiga_open_scsi(b, t, l, scgp);
+ f = amiga_open_scsi(b, t, l, usalp);
if (f != -1) {
- scglocal(scgp)->scgfiles[b][t][l] = f;
+ usallocal(usalp)->usalfiles[b][t][l] = f;
nopen++;
}
}
@@ -205,9 +205,9 @@
}
} else {
/* cdrecord [-scanbus] dev=b,t,l */
- f = amiga_open_scsi(busno, tgt, tlun, scgp);
+ f = amiga_open_scsi(busno, tgt, tlun, usalp);
if (f != -1) {
- scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
+ usallocal(usalp)->usalfiles[busno][tgt][tlun] = f;
nopen++;
}
}
@@ -218,15 +218,15 @@
if (b != -1) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- f = amiga_open_scsi(b, t, l, scgp);
+ f = amiga_open_scsi(b, t, l, usalp);
if (f != -1) {
- scglocal(scgp)->scgfiles[b][t][l] = f;
+ usallocal(usalp)->usalfiles[b][t][l] = f;
nopen++;
}
}
}
} else {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Scsi device %s not found", device);
}
} else {
@@ -237,13 +237,13 @@
*/
b = amiga_get_scsi_bus(device);
if (b != -1) {
- f = amiga_open_scsi(b, tgt, tlun, scgp);
+ f = amiga_open_scsi(b, tgt, tlun, usalp);
if (f != -1) {
- scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
+ usallocal(usalp)->usalfiles[busno][tgt][tlun] = f;
nopen++;
}
} else {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Scsi device %s not found", device);
}
}
@@ -253,21 +253,21 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
register int b;
register int t;
register int l;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- if (scglocal(scgp)->scgfiles[b][t][l] >= 0)
- amiga_close_scsi(scglocal(scgp)->scgfiles[b][t][l]);
- scglocal(scgp)->scgfiles[b][t][l] = -1;
+ if (usallocal(usalp)->usalfiles[b][t][l] >= 0)
+ amiga_close_scsi(usallocal(usalp)->usalfiles[b][t][l]);
+ usallocal(usalp)->usalfiles[b][t][l] = -1;
}
}
}
@@ -275,32 +275,32 @@
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
return (MAX_DMA_AMIGAOS);
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = valloc((size_t)(amt));
- return (scgp->bufbase);
+ usalp->bufbase = valloc((size_t)(amt));
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
register int t;
register int l;
@@ -308,45 +308,45 @@
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- if (scglocal(scgp)->scgfiles[busno][t][l] != -1)
+ if (usallocal(usalp)->usalfiles[busno][t][l] != -1)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((int)scglocal(scgp)->scgfiles[busno][tgt][tlun]);
+ return ((int)usallocal(usalp)->usalfiles[busno][tgt][tlun]);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (FALSE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
/* XXX Is there really no reset function on AmigaOS? */
errno = EINVAL;
@@ -354,23 +354,23 @@
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
register struct IOStdReq *ioreq = NULL;
struct SCSICmd Cmd;
int ret = 0;
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
sp->error = SCG_NO_ERROR;
sp->sense_count = 0;
sp->u_scb.cmd_scb[0] = 0;
sp->resid = 0;
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
- ioreq = request[scgp->fd].ioReq;
+ ioreq = request[usalp->fd].ioReq;
if (ioreq == NULL) {
sp->error = SCG_FATAL;
return (0);
@@ -611,15 +611,15 @@
}
static int
-amiga_open_scsi(int bus, int tgt, int lun, SCSI *scgp)
+amiga_open_scsi(int bus, int tgt, int lun, SCSI *usalp)
{
int fd = bus * MAX_TGT * MAX_LUN + tgt * MAX_LUN + lun;
int unit = DUNIT(bus, tgt, lun);
char *dev = devs[bus];
if (dev == NULL) {
- if (scgp->errstr) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr) {
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"No scsi device found at bus %ld\n", bus);
}
return (-1);
@@ -638,8 +638,8 @@
if (ami_debug)
printf("trying %s, unit %ld\n", dev, unit);
if (OpenDevice(dev, unit, (struct IORequest *)request[fd].ioReq, 0L)) {
- if (scgp->errstr) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr) {
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open %s\n", dev);
}
if (request[fd].ref_count == 0) {
@@ -653,14 +653,14 @@
printf("opening %s, unit %ld as fd %ld count %ld\n", dev, unit, fd, request[fd].ref_count);
}
} else {
- if (scgp->errstr) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr) {
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot create IOReq");
}
}
} else {
- if (scgp->errstr) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr) {
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open Message Port");
}
}
Modified: cdrkit/trunk/libusal/scsi-apollo.c
===================================================================
--- cdrkit/trunk/libscg/scsi-apollo.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-apollo.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -43,25 +43,25 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-apollo.c-1.5"; /* The version for this transport */
+static char _usal_trans_version[] = "scsi-apollo.c-1.5"; /* The version for this transport */
#define MAX_SCG 1 /* Max # of SCSI controllers */
#define MAX_TGT 1 /* Max # of SCSI targets */
#define MAX_LUN 1 /* Max # of SCSI logical units */
-struct scg_local {
+struct usal_local {
scsi_$handle_t handle;
unsigned char *DomainSensePointer;
- short scgfiles[MAX_SCG][MAX_TGT][MAX_LUN];
+ short usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
#ifndef SG_MAX_SENSE
#define SG_MAX_SENSE 16 /* Too small for CCS / SCSI-2 */
@@ -73,13 +73,13 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
@@ -94,62 +94,62 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "scsi_$do_command_2", "SCSI transport from Apollo DomainOS drivers",
+ __usal_help(f, "scsi_$do_command_2", "SCSI transport from Apollo DomainOS drivers",
"", "DomainOS driver name", "A DomainOS device node name", FALSE, TRUE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
register int nopen = 0;
status_$t status;
- if (scgp->debug > 1)
- printf("Entered scsi_open, scgp=%p, device='%s'\n", scgp, device);
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->debug > 1)
+ printf("Entered scsi_open, usalp=%p, device='%s'\n", usalp, device);
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
}
if (device == NULL || *device == '\0') {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE, "Must give device name");
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE, "Must give device name");
return (0);
}
- scsi_$acquire(device, strlen(device), &scglocal(scgp)->handle, &status);
+ scsi_$acquire(device, strlen(device), &usallocal(usalp)->handle, &status);
if (status.all) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE, "Cannot open '%s', status %08x", device, status.all);
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE, "Cannot open '%s', status %08x", device, status.all);
return (0);
}
/*
* Allocate the sense buffer
*/
- scglocal(scgp)->DomainSensePointer = (Uchar *)valloc((size_t) (SCG_MAX_SENSE + getpagesize()));
+ usallocal(usalp)->DomainSensePointer = (Uchar *)valloc((size_t) (SCG_MAX_SENSE + getpagesize()));
assert(status.all == 0);
/*
* Wire the sense buffer
*/
- scsi_$wire(scglocal(scgp)->handle, (caddr_t)(scglocal(scgp)->DomainSensePointer), SCG_MAX_SENSE, &status);
+ scsi_$wire(usallocal(usalp)->handle, (caddr_t)(usallocal(usalp)->DomainSensePointer), SCG_MAX_SENSE, &status);
assert(status.all == 0);
- if (scglocal(scgp)->scgfiles[0][0][0] == -1)
- scglocal(scgp)->scgfiles[0][0][0] = 1;
- scg_settarget(scgp, 0, 0, 0);
+ if (usallocal(usalp)->usalfiles[0][0][0] == -1)
+ usallocal(usalp)->usalfiles[0][0][0] = 1;
+ usal_settarget(usalp, 0, 0, 0);
return (++nopen);
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
status_$t status;
- if (scgp->debug > 1)
+ if (usalp->debug > 1)
printf("Entering scsi_close\n");
- scsi_$release(scglocal(scgp)->handle, &status);
+ scsi_$release(usallocal(usalp)->handle, &status);
/*
* should also unwire the sense buffer
*/
@@ -158,12 +158,12 @@
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
status_$t status;
scsi_$info_t info;
- scsi_$get_info(scglocal(scgp)->handle, sizeof (info), &info, &status);
+ scsi_$get_info(usallocal(usalp)->handle, sizeof (info), &info, &status);
if (status.all) {
/*
* Should have some better error handling here
@@ -176,98 +176,98 @@
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
void *ret;
- if (scgp->debug > 1)
+ if (usalp->debug > 1)
printf("scsi_getbuf: %ld bytes\n", amt);
ret = valloc((size_t)amt);
if (ret == NULL)
return (ret);
- scgp->bufbase = ret;
+ usalp->bufbase = ret;
return (ret);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->debug > 1)
+ if (usalp->debug > 1)
printf("Entering scsi_freebuf\n");
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
register int t;
register int l;
- if (scgp->debug > 1)
- printf("Entered scsi_havebus: scgp=%p, busno=%d\n", scgp, busno);
+ if (usalp->debug > 1)
+ printf("Entered scsi_havebus: usalp=%p, busno=%d\n", usalp, busno);
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- if (scglocal(scgp)->scgfiles[busno][t][l] >= 0)
+ if (usallocal(usalp)->usalfiles[busno][t][l] >= 0)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
- if (scgp->debug > 1)
- printf("Entered scsi_fileno: scgp=%p, busno=%d, tgt=%d, tlun=%d\n", scgp, busno, tgt, tlun);
+ if (usalp->debug > 1)
+ printf("Entered scsi_fileno: usalp=%p, busno=%d, tgt=%d, tlun=%d\n", usalp, busno, tgt, tlun);
if (busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- if (scgp->debug > 1)
- printf("exiting scsi_fileno, returning %d\n", scglocal(scgp)->scgfiles[busno][tgt][tlun]);
- return ((int) scglocal(scgp)->scgfiles[busno][tgt][tlun]);
+ if (usalp->debug > 1)
+ printf("exiting scsi_fileno, returning %d\n", usallocal(usalp)->usalfiles[busno][tgt][tlun]);
+ return ((int) usallocal(usalp)->usalfiles[busno][tgt][tlun]);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
- if (scgp->debug > 1)
+ if (usalp->debug > 1)
printf("Entering scsi_initiator\n");
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (FALSE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
status_$t status;
- if (scgp->debug > 0)
+ if (usalp->debug > 0)
printf("Entering scsi_reset\n");
if (what == SCG_RESET_NOP)
return (0);
if (what == SCG_RESET_TGT) {
- scsi_$reset_device(scglocal(scgp)->handle, &status);
+ scsi_$reset_device(usallocal(usalp)->handle, &status);
if (status.all)
printf("Error - scsi_$reset_device failed, status is 0x%08x\n", status.all);
return (status.all);
@@ -278,7 +278,7 @@
}
static void
-scsi_do_sense(SCSI *scgp, struct scg_cmd *sp)
+scsi_do_sense(SCSI *usalp, struct usal_cmd *sp)
{
scsi_$op_status_t op_status;
static scsi_$cdb_t sense_cdb;
@@ -300,45 +300,45 @@
sense_cdb.g0.cmd = SC_REQUEST_SENSE;
sense_cdb.g0.lun = sp->cdb.g0_cdb.lun;
sense_cdb.g0.len = sp->sense_len;
- scsi_$do_command_2(scglocal(scgp)->handle, sense_cdb, sense_cdb_size, (caddr_t) (scglocal(scgp)->DomainSensePointer), sense_buffer_size, scsi_read, &sense_op_id, &sense_status);
+ scsi_$do_command_2(usallocal(usalp)->handle, sense_cdb, sense_cdb_size, (caddr_t) (usallocal(usalp)->DomainSensePointer), sense_buffer_size, scsi_read, &sense_op_id, &sense_status);
if (sense_status.all) {
printf("Error executing sense command, status is 0x%08x\n", sense_status.all);
}
- scsi_$wait(scglocal(scgp)->handle, DomainScsiTimeout, true, sense_op_id, 1, &op_status, &sense_return_count, &sense_status);
+ scsi_$wait(usallocal(usalp)->handle, DomainScsiTimeout, true, sense_op_id, 1, &op_status, &sense_return_count, &sense_status);
/*
* Print the sense information if debug is on, or if the information is
* "unusual"
*/
- if (scgp->debug > 0 ||
+ if (usalp->debug > 0 ||
/*
* I don't prinqqt info for sense codes 0, 2, 5, 6 because
* they aren't interesting
*/
- (((u_char *) scglocal(scgp)->DomainSensePointer)[2] == 1) ||
- (((u_char *) scglocal(scgp)->DomainSensePointer)[2] == 3) ||
- (((u_char *) scglocal(scgp)->DomainSensePointer)[2] == 4) ||
- (((u_char *) scglocal(scgp)->DomainSensePointer)[2] >= 7)) {
+ (((u_char *) usallocal(usalp)->DomainSensePointer)[2] == 1) ||
+ (((u_char *) usallocal(usalp)->DomainSensePointer)[2] == 3) ||
+ (((u_char *) usallocal(usalp)->DomainSensePointer)[2] == 4) ||
+ (((u_char *) usallocal(usalp)->DomainSensePointer)[2] >= 7)) {
printf(" Sense dump:\n");
for (i = 0; i < sp->sense_len; i++)
- printf(" %02x", ((u_char *) scglocal(scgp)->DomainSensePointer)[i]);
+ printf(" %02x", ((u_char *) usallocal(usalp)->DomainSensePointer)[i]);
printf("\n");
}
- if (((u_char *) scglocal(scgp)->DomainSensePointer)[2] == 5) {
+ if (((u_char *) usallocal(usalp)->DomainSensePointer)[2] == 5) {
/*
* Illegal command
*/
- printf("Illegal command detected, ASC=0x%02x, ASQ=0x%02x\n", ((u_char *) scglocal(scgp)->DomainSensePointer)[12], ((u_char *) scglocal(scgp)->DomainSensePointer)[13]);
+ printf("Illegal command detected, ASC=0x%02x, ASQ=0x%02x\n", ((u_char *) usallocal(usalp)->DomainSensePointer)[12], ((u_char *) usallocal(usalp)->DomainSensePointer)[13]);
}
/*
* Copy the sense information to the driver
*/
- memcpy(sp->u_sense.cmd_sense, scglocal(scgp)->DomainSensePointer, sp->sense_len);
+ memcpy(sp->u_sense.cmd_sense, usallocal(usalp)->DomainSensePointer, sp->sense_len);
sp->sense_count = sp->sense_len;
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
linteger buffer_length;
linteger cdb_len;
@@ -349,16 +349,16 @@
status_$t status;
char *ascii_wait_status;
int i;
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
- if (scgp->debug > 0) {
- printf("Entered scgo_send, scgp=%p, sp=%p\n", scgp, sp);
- printf("scgcmd dump:\n");
+ if (usalp->debug > 0) {
+ printf("Entered usalo_send, usalp=%p, sp=%p\n", usalp, sp);
+ printf("usalcmd dump:\n");
printf(" addr=%p\n", sp->addr);
printf(" size=0x%x\n", sp->size);
printf(" flags=0x%x\n", sp->flags);
@@ -378,9 +378,9 @@
sp->resid = 0;
buffer_length = sp->size;
if (sp->addr) {
- if (scgp->debug > 0)
+ if (usalp->debug > 0)
printf(" wiring 0x%x bytes at 0x%x\n", buffer_length, sp->addr);
- scsi_$wire(scglocal(scgp)->handle, sp->addr, buffer_length, &status);
+ scsi_$wire(usallocal(usalp)->handle, sp->addr, buffer_length, &status);
if (status.all) {
/*
* Need better error handling
@@ -389,7 +389,7 @@
}
}
cdb_len = sp->cdb_len;
- scsi_$do_command_2(scglocal(scgp)->handle, /* device handle*/
+ scsi_$do_command_2(usallocal(usalp)->handle, /* device handle*/
*(scsi_$cdb_t *) &(sp->cdb.cmd_cdb[0]), /* SCSI CDB */
cdb_len, /* CDB len */
sp->addr, /* DMA buf */
@@ -406,10 +406,10 @@
sp->error = SCG_FATAL;
sp->ux_errno = EIO;
return (0);
- } else if (scgp->debug > 0) {
+ } else if (usalp->debug > 0) {
printf("Command submitted, operation=0x%x\n", operation);
}
- wait_index = scsi_$wait(scglocal(scgp)->handle, /* device handle*/
+ wait_index = scsi_$wait(usallocal(usalp)->handle, /* device handle*/
sp->timeout * 1000, /* timeout */
0, /* async enable */
operation, /* OP ID */
@@ -426,7 +426,7 @@
sp->ux_errno = EIO;
return (0);
} else {
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
printf("wait_index=%d, return_count=%d, op_status: op=0x%x, cmd_status=0x%x, op_status=0x%x\n",
wait_index, return_count, op_status.op, op_status.cmd_status, op_status.op_status);
}
@@ -472,16 +472,16 @@
sp->ux_errno = 0;
break;
case scsi_check_condition:
- if (scgp->debug > 0)
+ if (usalp->debug > 0)
printf("SCSI ERROR - CheckCondition\n");
- scsi_do_sense(scgp, sp);
+ scsi_do_sense(usalp, sp);
/*
* If this was a media error, then call it retryable,
* instead of no error
*/
- if ((((u_char *) scglocal(scgp)->DomainSensePointer)[0] == 0xf0) &&
- (((u_char *) scglocal(scgp)->DomainSensePointer)[2] == 0x03)) {
- if (scgp->debug > 0)
+ if ((((u_char *) usallocal(usalp)->DomainSensePointer)[0] == 0xf0) &&
+ (((u_char *) usallocal(usalp)->DomainSensePointer)[2] == 0x03)) {
+ if (usalp->debug > 0)
printf(" (retryable)\n");
sp->error = SCG_RETRYABLE;
sp->ux_errno = EIO;
@@ -508,7 +508,7 @@
*/
case scsi_$operation_timeout:
printf("SCSI ERROR - Timeout\n");
- scsi_do_sense(scgp, sp);
+ scsi_do_sense(usalp, sp);
sp->error = SCG_TIMEOUT;
sp->ux_errno = EIO;
break;
@@ -517,16 +517,16 @@
* This condition seems to occur occasionaly. I no longer
* complain because it doesn't seem to matter.
*/
- if (scgp->debug > 0)
+ if (usalp->debug > 0)
printf("SCSI ERROR - Underrun\n");
- scsi_do_sense(scgp, sp);
+ scsi_do_sense(usalp, sp);
sp->resid = sp->size; /* We don't have the right number */
sp->error = SCG_RETRYABLE;
sp->ux_errno = EIO;
break;
case scsi_$hdwr_failure: /* received when both scanners were active */
printf("SCSI ERROR - Hardware Failure\n");
- scsi_do_sense(scgp, sp);
+ scsi_do_sense(usalp, sp);
sp->error = SCG_RETRYABLE;
sp->ux_errno = EIO;
break;
@@ -537,9 +537,9 @@
}
}
if (sp->addr) {
- if (scgp->debug > 0)
+ if (usalp->debug > 0)
printf(" unwiring buffer\n");
- scsi_$unwire(scglocal(scgp)->handle, sp->addr, buffer_length, sp->flags & SCG_RECV_DATA, &status);
+ scsi_$unwire(usallocal(usalp)->handle, sp->addr, buffer_length, sp->flags & SCG_RECV_DATA, &status);
if (status.all) {
/*
* Need better error handling
Modified: cdrkit/trunk/libusal/scsi-beos.c
===================================================================
--- cdrkit/trunk/libscg/scsi-beos.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-beos.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -19,12 +19,12 @@
* Interface for the BeOS user-land raw SCSI implementation.
*
* This is a hack, that tries to emulate the functionality
- * of the scg driver.
+ * of the usal driver.
*
* First version done by swetland at be.com
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -49,12 +49,12 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-beos.c-1.23"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-beos.c-1.23"; /* The version for this transport*/
/*
* There are also defines for:
@@ -137,7 +137,7 @@
#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
-#include <scg/scgio.h>
+#include <usal/usalio.h>
/* this is really really dumb (tm) */
/*#undef sense*/
@@ -161,19 +161,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -182,27 +182,27 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "CAM", "Generic transport independent SCSI (BeOS CAM variant)",
+ __usal_help(f, "CAM", "Generic transport independent SCSI (BeOS CAM variant)",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
#ifdef nonono
- int tlun = scg_lun(scgp);
+ int tlun = usal_lun(usalp);
#endif
#ifdef nonono
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
@@ -211,8 +211,8 @@
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2)) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open by 'devname' not supported on this OS");
return (-1);
}
@@ -220,13 +220,13 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
struct _fdmap_ *f;
struct _fdmap_ *fnext;
- for (f = (struct _fdmap_ *)scgp->local; f; f = fnext) {
- scgp->local = 0;
+ for (f = (struct _fdmap_ *)usalp->local; f; f = fnext) {
+ usalp->local = 0;
fnext = f->next;
close(f->fd);
free(f);
@@ -235,33 +235,33 @@
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
return (128*1024);
return (256*1024);
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = malloc((size_t)(amt));
- return (scgp->bufbase);
+ usalp->bufbase = malloc((size_t)(amt));
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
struct stat sb;
char buf[128];
@@ -276,13 +276,13 @@
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
struct _fdmap_ *f;
char buf[128];
int fd;
- for (f = (struct _fdmap_ *)scgp->local; f; f = f->next) {
+ for (f = (struct _fdmap_ *)usalp->local; f; f = f->next) {
if (f->bus == busno && f->targ == tgt && f->lun == tlun)
return (f->fd);
}
@@ -304,20 +304,20 @@
f->targ = tgt;
f->lun = tlun;
f->fd = fd;
- f->next = (struct _fdmap_ *)scgp->local;
- scgp->local = f;
+ f->next = (struct _fdmap_ *)usalp->local;
+ usalp->local = f;
}
return (fd);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
/*
* XXX Should check for ATAPI
@@ -326,22 +326,22 @@
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
errno = EINVAL;
return (-1);
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
int e;
int scsi_error;
int cam_error;
raw_device_command rdc;
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
@@ -362,13 +362,13 @@
sp->u_scb.cmd_scb[0] = 0;
sp->resid = 0;
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
fprintf(stderr, "SEND(%d): cmd %02x, cdblen = %d, datalen = %ld, senselen = %ld\n",
- scgp->fd, rdc.command[0], rdc.command_length,
+ usalp->fd, rdc.command[0], rdc.command_length,
rdc.data_length, rdc.sense_data_length);
}
- e = ioctl(scgp->fd, B_RAW_DEVICE_COMMAND, &rdc, sizeof (rdc));
- if (scgp->debug > 0) {
+ e = ioctl(usalp->fd, B_RAW_DEVICE_COMMAND, &rdc, sizeof (rdc));
+ if (usalp->debug > 0) {
fprintf(stderr, "SEND(%d): -> %d CAM Status %02X SCSI status %02X\n", e, rdc.cam_status, rdc.scsi_status);
}
sp->ux_errno = 0;
Modified: cdrkit/trunk/libusal/scsi-bsd-os.c
===================================================================
--- cdrkit/trunk/libscg/scsi-bsd-os.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-bsd-os.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -19,10 +19,10 @@
* Interface for the BSD/OS user-land raw SCSI implementation.
*
* This is a hack, that tries to emulate the functionality
- * of the scg driver.
+ * of the usal driver.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -58,28 +58,28 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-bsd-os.c-1.28"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-bsd-os.c-1.28"; /* The version for this transport*/
#define MAX_SCG 16 /* Max # of SCSI controllers */
#define MAX_TGT 16
#define MAX_LUN 8
-struct scg_local {
- short scgfiles[MAX_SCG][MAX_TGT][MAX_LUN];
+struct usal_local {
+ short usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
#include <machine/param.h>
#define MAX_DMA_BSDI MAXPHYS /* More makes problems */
-static BOOL scg_setup(SCSI *scgp, int f, int busno, int tgt, int tlun);
+static BOOL usal_setup(SCSI *usalp, int f, int busno, int tgt, int tlun);
/*
* Return version information for the low level SCSI transport code.
@@ -87,19 +87,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -108,19 +108,19 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "SCSIRAWCDB", "Generic SCSI for devices known by BSDi",
+ __usal_help(f, "SCSIRAWCDB", "Generic SCSI for devices known by BSDi",
"", "devname:@,lun", "/dev/rsr0a:@,0", FALSE, TRUE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
register int f;
register int b;
register int t;
@@ -130,22 +130,22 @@
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -161,7 +161,7 @@
if (f < 0) {
goto openbydev;
}
- scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
+ usallocal(usalp)->usalfiles[busno][tgt][tlun] = f;
return (1);
} else for (b = 0; b < MAX_SCG; b++) {
@@ -176,14 +176,14 @@
if (errno != ENOENT &&
errno != ENXIO &&
errno != ENODEV) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'",
devname);
return (0);
}
} else {
- if (scg_setup(scgp, f, b, t, l))
+ if (usal_setup(usalp, f, b, t, l))
nopen++;
}
}
@@ -199,8 +199,8 @@
return (0);
f = open(device, O_RDWR|O_NONBLOCK);
if (f < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'",
device);
return (0);
@@ -212,32 +212,32 @@
}
busno = 0; /* use fake number, we cannot get it */
tgt = 0; /* use fake number, we cannot get it */
- scg_settarget(scgp, busno, tgt, tlun);
+ usal_settarget(usalp, busno, tgt, tlun);
/* 'lun' has been specified on command line */
- if (scg_setup(scgp, f, busno, tgt, tlun))
+ if (usal_setup(usalp, f, busno, tgt, tlun))
nopen++;
}
return (nopen);
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
register int f;
register int b;
register int t;
register int l;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- f = scglocal(scgp)->scgfiles[b][t][l];
+ f = usallocal(usalp)->usalfiles[b][t][l];
if (f >= 0)
close(f);
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -245,14 +245,14 @@
}
static BOOL
-scg_setup(SCSI *scgp, int f, int busno, int tgt, int tlun)
+usal_setup(SCSI *usalp, int f, int busno, int tgt, int tlun)
{
int Bus;
int Target;
int Lun;
BOOL onetarget = FALSE;
- if (scg_scsibus(scgp) >= 0 && scg_target(scgp) >= 0 && scg_lun(scgp) >= 0)
+ if (usal_scsibus(usalp) >= 0 && usal_target(usalp) >= 0 && usal_lun(usalp) >= 0)
onetarget = TRUE;
/*
@@ -262,8 +262,8 @@
Target = tgt;
Lun = tlun;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"Bus: %d Target: %d Lun: %d\n", Bus, Target, Lun);
}
@@ -272,14 +272,14 @@
return (FALSE);
}
- if (scglocal(scgp)->scgfiles[Bus][Target][Lun] == (short)-1)
- scglocal(scgp)->scgfiles[Bus][Target][Lun] = (short)f;
+ if (usallocal(usalp)->usalfiles[Bus][Target][Lun] == (short)-1)
+ usallocal(usalp)->usalfiles[Bus][Target][Lun] = (short)f;
if (onetarget) {
if (Bus == busno && Target == tgt && Lun == tlun) {
return (TRUE);
} else {
- scglocal(scgp)->scgfiles[Bus][Target][Lun] = (short)-1;
+ usallocal(usalp)->usalfiles[Bus][Target][Lun] = (short)-1;
close(f);
}
}
@@ -287,7 +287,7 @@
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
long maxdma = MAX_DMA_BSDI;
@@ -295,26 +295,26 @@
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = malloc((size_t)(amt));
- return (scgp->bufbase);
+ usalp->bufbase = malloc((size_t)(amt));
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
register int t;
register int l;
@@ -322,45 +322,45 @@
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- if (scglocal(scgp)->scgfiles[busno][t][l] >= 0)
+ if (usallocal(usalp)->usalfiles[busno][t][l] >= 0)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((int)scglocal(scgp)->scgfiles[busno][tgt][tlun]);
+ return ((int)usallocal(usalp)->usalfiles[busno][tgt][tlun]);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (FALSE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
/*
* Cannot reset on BSD/OS
@@ -370,14 +370,14 @@
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
scsi_user_cdb_t suc;
int ret = 0;
-/* js_fprintf((FILE *)scgp->errfile, "f: %d\n", f);*/
- if (scgp->fd < 0) {
+/* js_fprintf((FILE *)usalp->errfile, "f: %d\n", f);*/
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
@@ -400,7 +400,7 @@
suc.suc_datalen = sp->size;
suc.suc_data = sp->addr;
- if (ioctl(scgp->fd, SCSIRAWCDB, &suc) < 0) {
+ if (ioctl(usalp->fd, SCSIRAWCDB, &suc) < 0) {
ret = -1;
sp->ux_errno = geterrno();
if (sp->ux_errno != ENOTTY)
Modified: cdrkit/trunk/libusal/scsi-bsd.c
===================================================================
--- cdrkit/trunk/libscg/scsi-bsd.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-bsd.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -19,13 +19,13 @@
* Interface for the NetBSD/FreeBSD/OpenBSD generic SCSI implementation.
*
* This is a hack, that tries to emulate the functionality
- * of the scg driver.
+ * of the usal driver.
* The SCSI tranport of the generic *BSD implementation is very
* similar to the SCSI command transport of the
- * 6 years older scg driver.
+ * 6 years older usal driver.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -54,21 +54,21 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-bsd.c-1.42"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-bsd.c-1.42"; /* The version for this transport*/
#define MAX_SCG 16 /* Max # of SCSI controllers */
#define MAX_TGT 16
#define MAX_LUN 8
-struct scg_local {
- short scgfiles[MAX_SCG][MAX_TGT][MAX_LUN];
+struct usal_local {
+ short usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
/*#define MAX_DMA_BSD (32*1024)*/
#define MAX_DMA_BSD (60*1024) /* More seems to make problems */
@@ -97,7 +97,7 @@
#define SADDR_LUN(a) (a).lun
#endif /* __NetBSD__ && TYPE_ATAPI */
-static BOOL scg_setup(SCSI *scgp, int f, int busno, int tgt, int tlun);
+static BOOL usal_setup(SCSI *usalp, int f, int busno, int tgt, int tlun);
/*
* Return version information for the low level SCSI transport code.
@@ -105,19 +105,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -126,19 +126,19 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "SCIOCCOMMAND", "SCSI for devices known by *BSD",
+ __usal_help(f, "SCIOCCOMMAND", "SCSI for devices known by *BSD",
"", "device or bus,target,lun", "/dev/rcd0a:@ or 1,2,0", FALSE, TRUE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
register int f;
register int b;
register int t;
@@ -148,22 +148,22 @@
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -179,7 +179,7 @@
if (f < 0) {
goto openbydev;
}
- scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
+ usallocal(usalp)->usalfiles[busno][tgt][tlun] = f;
return (1);
} else for (b = 0; b < MAX_SCG; b++) {
@@ -194,14 +194,14 @@
if (errno != ENOENT &&
errno != ENXIO &&
errno != ENODEV) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'",
devname);
return (0);
}
} else {
- if (scg_setup(scgp, f, b, t, l))
+ if (usal_setup(usalp, f, b, t, l))
nopen++;
}
}
@@ -219,8 +219,8 @@
return (0);
f = open(device, O_RDWR);
if (f < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'",
device);
return (0);
@@ -239,32 +239,32 @@
return (0);
}
tlun = SADDR_LUN(saddr);
- scg_settarget(scgp, busno, tgt, tlun);
+ usal_settarget(usalp, busno, tgt, tlun);
}
- if (scg_setup(scgp, f, busno, tgt, tlun))
+ if (usal_setup(usalp, f, busno, tgt, tlun))
nopen++;
}
return (nopen);
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
register int f;
register int b;
register int t;
register int l;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- f = scglocal(scgp)->scgfiles[b][t][l];
+ f = usallocal(usalp)->usalfiles[b][t][l];
if (f >= 0)
close(f);
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -272,7 +272,7 @@
}
static BOOL
-scg_setup(SCSI *scgp, int f, int busno, int tgt, int tlun)
+usal_setup(SCSI *usalp, int f, int busno, int tgt, int tlun)
{
struct scsi_addr saddr;
int Bus;
@@ -280,7 +280,7 @@
int Lun;
BOOL onetarget = FALSE;
- if (scg_scsibus(scgp) >= 0 && scg_target(scgp) >= 0 && scg_lun(scgp) >= 0)
+ if (usal_scsibus(usalp) >= 0 && usal_target(usalp) >= 0 && usal_lun(usalp) >= 0)
onetarget = TRUE;
if (ioctl(f, SCIOCIDENTIFY, &saddr) < 0) {
@@ -292,8 +292,8 @@
Target = SADDR_TARGET(saddr);
Lun = SADDR_LUN(saddr);
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"Bus: %d Target: %d Lun: %d\n", Bus, Target, Lun);
}
@@ -302,14 +302,14 @@
return (FALSE);
}
- if (scglocal(scgp)->scgfiles[Bus][Target][Lun] == (short)-1)
- scglocal(scgp)->scgfiles[Bus][Target][Lun] = (short)f;
+ if (usallocal(usalp)->usalfiles[Bus][Target][Lun] == (short)-1)
+ usallocal(usalp)->usalfiles[Bus][Target][Lun] = (short)f;
if (onetarget) {
if (Bus == busno && Target == tgt && Lun == tlun) {
return (TRUE);
} else {
- scglocal(scgp)->scgfiles[Bus][Target][Lun] = (short)-1;
+ usallocal(usalp)->usalfiles[Bus][Target][Lun] = (short)-1;
close(f);
}
}
@@ -317,7 +317,7 @@
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
long maxdma = MAX_DMA_BSD;
@@ -325,26 +325,26 @@
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = valloc((size_t)(amt));
- return (scgp->bufbase);
+ usalp->bufbase = valloc((size_t)(amt));
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
register int t;
register int l;
@@ -352,44 +352,44 @@
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- if (scglocal(scgp)->scgfiles[busno][t][l] >= 0)
+ if (usallocal(usalp)->usalfiles[busno][t][l] >= 0)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((int)scglocal(scgp)->scgfiles[busno][tgt][tlun]);
+ return ((int)usallocal(usalp)->usalfiles[busno][tgt][tlun]);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
#ifdef MAYBE_ATAPI
struct scsi_addr saddr;
- if (ioctl(scgp->fd, SCIOCIDENTIFY, &saddr) < 0)
+ if (ioctl(usalp->fd, SCIOCIDENTIFY, &saddr) < 0)
return (-1);
if (!SADDR_ISSCSI(saddr))
@@ -399,7 +399,7 @@
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
if (what == SCG_RESET_NOP)
return (0);
@@ -410,20 +410,20 @@
/*
* XXX Does this reset TGT or BUS ???
*/
- return (ioctl(scgp->fd, SCIOCRESET, 0));
+ return (ioctl(usalp->fd, SCIOCRESET, 0));
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
scsireq_t req;
register long *lp1;
register long *lp2;
int ret = 0;
-/* js_fprintf((FILE *)scgp->errfile, "fd: %d\n", scgp->fd);*/
- if (scgp->fd < 0) {
+/* js_fprintf((FILE *)usalp->errfile, "fd: %d\n", usalp->fd);*/
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
@@ -456,7 +456,7 @@
req.retsts = 0;
req.error = 0;
- if (ioctl(scgp->fd, SCIOCCOMMAND, (void *)&req) < 0) {
+ if (ioctl(usalp->fd, SCIOCCOMMAND, (void *)&req) < 0) {
ret = -1;
sp->ux_errno = geterrno();
if (sp->ux_errno != ENOTTY)
@@ -538,18 +538,18 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-bsd.c-1.42"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-bsd.c-1.42"; /* The version for this transport*/
#define CAM_MAXDEVS 128
-struct scg_local {
+struct usal_local {
struct cam_device *cam_devices[CAM_MAXDEVS + 1];
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
/*
* Return version information for the low level SCSI transport code.
@@ -557,19 +557,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -578,9 +578,9 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "CAM", "Generic transport independent SCSI (Common Access Method)",
+ __usal_help(f, "CAM", "Generic transport independent SCSI (Common Access Method)",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
return (0);
}
@@ -589,11 +589,11 @@
* Build a list of everything we can find.
*/
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
char name[16];
int unit;
int nopen = 0;
@@ -604,19 +604,19 @@
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2)) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open by 'devname' not supported on this OS");
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
for (unit = 0; unit <= CAM_MAXDEVS; unit++) {
- scglocal(scgp)->cam_devices[unit] = (struct cam_device *)-1;
+ usallocal(usalp)->cam_devices[unit] = (struct cam_device *)-1;
}
}
@@ -625,8 +625,8 @@
* If we're not scanning the bus, just open one device.
*/
if (busno >= 0 && tgt >= 0 && tlun >= 0) {
- scglocal(scgp)->cam_devices[0] = cam_open_btl(busno, tgt, tlun, O_RDWR, NULL);
- if (scglocal(scgp)->cam_devices[0] == NULL)
+ usallocal(usalp)->cam_devices[0] = cam_open_btl(busno, tgt, tlun, O_RDWR, NULL);
+ if (usallocal(usalp)->cam_devices[0] == NULL)
return (-1);
nopen++;
return (nopen);
@@ -638,8 +638,8 @@
*/
if ((fd = open(XPT_DEVICE, O_RDWR)) < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open of %s failed", XPT_DEVICE);
return (-1);
}
@@ -658,8 +658,8 @@
ccb.cdm.match_buf_len = bufsize;
ccb.cdm.matches = (struct dev_match_result *)malloc(bufsize);
if (ccb.cdm.matches == NULL) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Couldn't malloc match buffer");
close(fd);
return (-1);
@@ -675,8 +675,8 @@
ccb.cdm.patterns = (struct dev_match_pattern *)malloc(
sizeof (struct dev_match_pattern));
if (ccb.cdm.patterns == NULL) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Couldn't malloc pattern buffer");
close(fd);
free(ccb.cdm.matches);
@@ -689,8 +689,8 @@
match_pat->flags = PERIPH_MATCH_NAME;
if (ioctl(fd, CAMIOCOMMAND, &ccb) == -1) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"CAMIOCOMMAND ioctl failed");
close(fd);
free(ccb.cdm.matches);
@@ -702,8 +702,8 @@
((ccb.cdm.status != CAM_DEV_MATCH_LAST) &&
(ccb.cdm.status != CAM_DEV_MATCH_MORE))) {
/* errmsgno(EX_BAD, "Got CAM error 0x%X, CDM error %d.\n",*/
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Got CAM error 0x%X, CDM error %d",
ccb.ccb_h.status, ccb.cdm.status);
close(fd);
@@ -725,8 +725,8 @@
*/
if (ccb.cdm.matches[unit].type != DEV_MATCH_PERIPH) {
/* errmsgno(EX_BAD, "Kernel error! got periph match type %d!!\n",*/
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Kernel error! got periph match type %d!!",
ccb.cdm.matches[unit].type);
free(ccb.cdm.matches);
@@ -743,22 +743,22 @@
* "regular device name" to passthrough unit number and
* just opens the device in question as a passthrough device.
*/
- scglocal(scgp)->cam_devices[unit] = cam_open_pass(name, O_RDWR, NULL);
+ usallocal(usalp)->cam_devices[unit] = cam_open_pass(name, O_RDWR, NULL);
/*
* If we get back NULL from the open routine, it wasn't
* able to open the given passthrough device for one reason
* or another.
*/
- if (scglocal(scgp)->cam_devices[unit] == NULL) {
+ if (usallocal(usalp)->cam_devices[unit] == NULL) {
#ifdef OLD
errmsgno(EX_BAD, "Error opening /dev/%s%d\n",
periph_result->periph_name,
periph_result->unit_number);
errmsgno(EX_BAD, "%s\n", cam_errbuf);
#endif
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Error opening /dev/%s%d Cam error '%s'",
periph_result->periph_name,
periph_result->unit_number,
@@ -773,23 +773,23 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
register int i;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
for (i = 0; i <= CAM_MAXDEVS; i++) {
- if (scglocal(scgp)->cam_devices[i] != (struct cam_device *)-1)
- cam_close_device(scglocal(scgp)->cam_devices[i]);
- scglocal(scgp)->cam_devices[i] = (struct cam_device *)-1;
+ if (usallocal(usalp)->cam_devices[i] != (struct cam_device *)-1)
+ cam_close_device(usallocal(usalp)->cam_devices[i]);
+ usallocal(usalp)->cam_devices[i] = (struct cam_device *)-1;
}
return (0);
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
#ifdef DFLTPHYS
return (DFLTPHYS);
@@ -799,78 +799,78 @@
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = valloc((size_t)(amt));
- return (scgp->bufbase);
+ usalp->bufbase = valloc((size_t)(amt));
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
int unit;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
/*
* There's a "cleaner" way to do this, using the matching code, but
* it would involve more code than this solution...
*/
- for (unit = 0; scglocal(scgp)->cam_devices[unit] != (struct cam_device *)-1; unit++) {
- if (scglocal(scgp)->cam_devices[unit] == NULL)
+ for (unit = 0; usallocal(usalp)->cam_devices[unit] != (struct cam_device *)-1; unit++) {
+ if (usallocal(usalp)->cam_devices[unit] == NULL)
continue;
- if (scglocal(scgp)->cam_devices[unit]->path_id == busno)
+ if (usallocal(usalp)->cam_devices[unit]->path_id == busno)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int unit, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int unit, int tlun)
{
int i;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- for (i = 0; scglocal(scgp)->cam_devices[i] != (struct cam_device *)-1; i++) {
- if (scglocal(scgp)->cam_devices[i] == NULL)
+ for (i = 0; usallocal(usalp)->cam_devices[i] != (struct cam_device *)-1; i++) {
+ if (usallocal(usalp)->cam_devices[i] == NULL)
continue;
- if ((scglocal(scgp)->cam_devices[i]->path_id == busno) &&
- (scglocal(scgp)->cam_devices[i]->target_id == unit) &&
- (scglocal(scgp)->cam_devices[i]->target_lun == tlun))
+ if ((usallocal(usalp)->cam_devices[i]->path_id == busno) &&
+ (usallocal(usalp)->cam_devices[i]->target_id == unit) &&
+ (usallocal(usalp)->cam_devices[i]->target_lun == tlun))
return (i);
}
return (-1);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (FALSE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
/* XXX synchronous reset command - is this wise? */
errno = EINVAL;
@@ -878,25 +878,25 @@
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
struct cam_device *dev;
union ccb ccb_space;
union ccb *ccb = &ccb_space;
int rv, result;
u_int32_t ccb_flags;
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
#if 0
- js_fprintf((FILE *)scgp->errfile,
- "attempt to reference invalid unit %d\n", scgp->fd);
+ js_fprintf((FILE *)usalp->errfile,
+ "attempt to reference invalid unit %d\n", usalp->fd);
#endif
sp->error = SCG_FATAL;
return (0);
}
- dev = scglocal(scgp)->cam_devices[scgp->fd];
+ dev = usallocal(usalp)->cam_devices[usalp->fd];
fillbytes(&ccb->ccb_h, sizeof (struct ccb_hdr), '\0');
ccb->ccb_h.path_id = dev->path_id;
ccb->ccb_h.target_id = dev->target_id;
@@ -922,7 +922,7 @@
* If you don't want to bother with sending tagged commands under CAM,
* we don't need to do anything to cdrecord. If you want to send
* tagged commands to those devices that support it, we'll need to set
- * the tag action valid field like this in scgo_send():
+ * the tag action valid field like this in usalo_send():
*
* ccb_flags |= CAM_DEV_QFRZDIS | CAM_TAG_ACTION_VALID;
*/
Modified: cdrkit/trunk/libusal/scsi-dos.c
===================================================================
--- cdrkit/trunk/libscg/scsi-dos.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-dos.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -25,7 +25,7 @@
* Made from Win32 ASPI library template.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -53,25 +53,25 @@
#include <dos.h>
#include <dpmi.h>
#include <go32.h>
-#include <scg/aspi-dos.h>
+#include <usal/aspi-dos.h>
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-dos.c-1.11"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-dos.c-1.11"; /* The version for this transport*/
#define MAX_SCG 8
#define MAX_TGT 8
#define MAX_LUN 8
-struct scg_local {
+struct usal_local {
int dummy;
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
#define MAX_DMA_DOS (63L*1024L)
@@ -89,15 +89,15 @@
static void SCSIMgrCallBack(_go32_dpmi_registers *regs);
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -106,24 +106,24 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "ASPI", "Generic transport independent SCSI",
+ __usal_help(f, "ASPI", "Generic transport independent SCSI",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
@@ -131,8 +131,8 @@
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2)) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open by 'devname' not supported on this OS");
return (-1);
}
@@ -150,15 +150,15 @@
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
}
/*
* Try to open ASPI-Router
*/
- if (!SCSIMgrOpen(scgp))
+ if (!SCSIMgrOpen(usalp))
return (-1);
/*
@@ -181,39 +181,39 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
SCSIMgrClose();
return (0);
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
return (MAX_DMA_DOS);
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = malloc((size_t)(amt));
- return (scgp->bufbase);
+ usalp->bufbase = malloc((size_t)(amt));
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static __SBOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
if (busno < 0 || busno >= busses)
return (FALSE);
@@ -222,7 +222,7 @@
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= busses ||
tgt < 0 || tgt >= MAX_TGT ||
@@ -236,28 +236,28 @@
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (-1);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
errno = EINVAL;
return (-1);
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
SRB Srb;
int dos_memory_data_seg;
int dos_memory_data_sel;
@@ -267,12 +267,12 @@
* Check if ASPI library is loaded
*/
if (!SCSIMgrEntry) {
- errmsgno(EX_BAD, "error in scgo_send: ASPI driver not loaded.\n");
+ errmsgno(EX_BAD, "error in usalo_send: ASPI driver not loaded.\n");
sp->error = SCG_FATAL;
return (-1);
}
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
@@ -301,8 +301,8 @@
default:
sp->error = SCG_FATAL;
sp->ux_errno = EINVAL;
- js_fprintf((FILE *)scgp->errfile,
- "Unsupported sp->cdb_len: %u. Fatal error in scgo_send, exiting...\n", sp->cdb_len);
+ js_fprintf((FILE *)usalp->errfile,
+ "Unsupported sp->cdb_len: %u. Fatal error in usalo_send, exiting...\n", sp->cdb_len);
return (-1);
}
@@ -315,9 +315,9 @@
_dosmemputb(sp->addr, sp->size, dos_memory_data_seg<<4);
Srb.Cmd = SC_EXEC_SCSI_CMD;
- Srb.HaId = scg_scsibus(scgp);
- Srb.Type.ExecSCSICmd.Target = scg_target(scgp);
- Srb.Type.ExecSCSICmd.Lun = scg_lun(scgp);
+ Srb.HaId = usal_scsibus(usalp);
+ Srb.Type.ExecSCSICmd.Target = usal_target(usalp);
+ Srb.Type.ExecSCSICmd.Lun = usal_lun(usalp);
Srb.Type.ExecSCSICmd.BufLen = sp->size;
Srb.Type.ExecSCSICmd.BufPointer = (void *)dos_memory_data_ptr;
Srb.Type.ExecSCSICmd.CDBLen = sp->cdb_len;
@@ -347,14 +347,14 @@
}
}
- SCSIMgrSendSRB(&Srb, scgp->scmd->timeout);
+ SCSIMgrSendSRB(&Srb, usalp->scmd->timeout);
Srb.Type.ExecSCSICmd.BufPointer = sp->addr;
_dosmemgetb(dos_memory_data_seg<<4, sp->size, sp->addr);
__dpmi_free_dos_memory(dos_memory_data_sel);
if (Srb.Status == SS_PENDING) { /* Check if we got a timeout*/
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"Timeout....\n");
}
sp->error = SCG_TIMEOUT;
@@ -366,9 +366,9 @@
*/
if (Srb.Status != SS_COMP) {
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "Error in scgo_send: Srb.Status is 0x%x\n", Srb.Status);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "Error in usalo_send: Srb.Status is 0x%x\n", Srb.Status);
}
switch (Srb.Status) {
@@ -424,8 +424,8 @@
}
sp->u_scb.cmd_scb[0] = Srb.Type.ExecSCSICmd.TargStat;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"Mapped to: error %d errno: %d\n", sp->error, sp->ux_errno);
}
return (1);
@@ -435,7 +435,7 @@
}
static BOOL
-SCSIMgrOpen(SCSI *scgp)
+SCSIMgrOpen(SCSI *usalp)
{
int hSCSIMgr;
int dos_memory_seg;
@@ -477,14 +477,14 @@
/* Allocate real mode callback */
_callback_info.pm_offset = (unsigned long)&SCSIMgrCallBack;
if (_go32_dpmi_allocate_real_mode_callback_retf(&_callback_info, &_callback_regs) == -1) {
- js_fprintf((FILE *)scgp->errfile, "Cannot allocate callback address!\n");
+ js_fprintf((FILE *)usalp->errfile, "Cannot allocate callback address!\n");
SCSIMgrEntry = 0;
}
}
/* SCSIMgr entry point founded? */
if (!SCSIMgrEntry) {
- js_fprintf((FILE *)scgp->errfile, "Cannot open ASPI manager! Try to get one from http://bootcd.narod.ru/\n");
+ js_fprintf((FILE *)usalp->errfile, "Cannot open ASPI manager! Try to get one from http://bootcd.narod.ru/\n");
return (FALSE);
}
@@ -493,13 +493,13 @@
SCSIMgrSendSRB(&Srb, 10);
- if (scgp->debug) {
- js_fprintf((FILE *)scgp->errfile, "Status : %ld\n", Srb.Status);
- js_fprintf((FILE *)scgp->errfile, "hacount: %d\n", Srb.Type.HAInquiry.Count);
- js_fprintf((FILE *)scgp->errfile, "SCSI id: %d\n", Srb.Type.HAInquiry.SCSI_ID);
- js_fprintf((FILE *)scgp->errfile, "Manager: '%.16s'\n", Srb.Type.HAInquiry.ManagerId);
- js_fprintf((FILE *)scgp->errfile, "Identif: '%.16s'\n", Srb.Type.HAInquiry.Identifier);
- scg_prbytes("Unique:", Srb.Type.HAInquiry.Unique, 16);
+ if (usalp->debug) {
+ js_fprintf((FILE *)usalp->errfile, "Status : %ld\n", Srb.Status);
+ js_fprintf((FILE *)usalp->errfile, "hacount: %d\n", Srb.Type.HAInquiry.Count);
+ js_fprintf((FILE *)usalp->errfile, "SCSI id: %d\n", Srb.Type.HAInquiry.SCSI_ID);
+ js_fprintf((FILE *)usalp->errfile, "Manager: '%.16s'\n", Srb.Type.HAInquiry.ManagerId);
+ js_fprintf((FILE *)usalp->errfile, "Identif: '%.16s'\n", Srb.Type.HAInquiry.Identifier);
+ usal_prbytes("Unique:", Srb.Type.HAInquiry.Unique, 16);
}
AspiLoaded++;
Modified: cdrkit/trunk/libusal/scsi-hpux.c
===================================================================
--- cdrkit/trunk/libscg/scsi-hpux.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-hpux.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -19,7 +19,7 @@
* Interface for the HP-UX generic SCSI implementation.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -46,21 +46,21 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-hpux.c-1.31"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-hpux.c-1.31"; /* The version for this transport*/
#define MAX_SCG 16 /* Max # of SCSI controllers */
#define MAX_TGT 16
#define MAX_LUN 8
-struct scg_local {
- short scgfiles[MAX_SCG][MAX_TGT][MAX_LUN];
+struct usal_local {
+ short usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
#ifdef SCSI_MAXPHYS
# define MAX_DMA_HP SCSI_MAXPHYS
@@ -75,19 +75,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -96,19 +96,19 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "SIOC", "Generic SCSI",
+ __usal_help(f, "SIOC", "Generic SCSI",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
register int f;
register int b;
register int t;
@@ -118,8 +118,8 @@
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
@@ -127,21 +127,21 @@
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2)) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open by 'devname' not supported on this OS");
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -153,7 +153,7 @@
f = open(devname, O_RDWR);
if (f < 0)
return (-1);
- scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
+ usallocal(usalp)->usalfiles[busno][tgt][tlun] = f;
return (1);
} else {
for (b = 0; b < MAX_SCG; b++) {
@@ -165,9 +165,9 @@
/*fprintf(stderr, "name: '%s'\n", devname);*/
f = open(devname, O_RDWR);
if (f >= 0) {
- scglocal(scgp)->scgfiles[b][t][l] = (short)f;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)f;
nopen++;
- } else if (scgp->debug > 0) {
+ } else if (usalp->debug > 0) {
errmsg("open '%s'\n", devname);
}
}
@@ -178,23 +178,23 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
register int f;
register int b;
register int t;
register int l;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- f = scglocal(scgp)->scgfiles[b][t][l];
+ f = usallocal(usalp)->usalfiles[b][t][l];
if (f >= 0)
close(f);
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -202,32 +202,32 @@
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
return (MAX_DMA_HP);
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = valloc((size_t)(amt));
- return (scgp->bufbase);
+ usalp->bufbase = valloc((size_t)(amt));
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
register int t;
register int l;
@@ -235,45 +235,45 @@
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- if (scglocal(scgp)->scgfiles[busno][t][l] >= 0)
+ if (usallocal(usalp)->usalfiles[busno][t][l] >= 0)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((int)scglocal(scgp)->scgfiles[busno][tgt][tlun]);
+ return ((int)usallocal(usalp)->usalfiles[busno][tgt][tlun]);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (FALSE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
if (what == SCG_RESET_NOP)
return (0);
@@ -281,18 +281,18 @@
errno = EINVAL;
return (-1);
}
- return (ioctl(scgp->fd, SIOC_RESET_BUS, 0));
+ return (ioctl(usalp->fd, SIOC_RESET_BUS, 0));
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
int ret;
int flags;
struct sctl_io sctl_io;
- if ((scgp->fd < 0) || (sp->cdb_len > sizeof (sctl_io.cdb))) {
+ if ((usalp->fd < 0) || (sp->cdb_len > sizeof (sctl_io.cdb))) {
sp->error = SCG_FATAL;
return (0);
}
@@ -325,13 +325,13 @@
sp->u_scb.cmd_scb[0] = 0;
sp->resid = 0;
- ret = ioctl(scgp->fd, SIOC_IO, &sctl_io);
+ ret = ioctl(usalp->fd, SIOC_IO, &sctl_io);
if (ret < 0) {
sp->error = SCG_FATAL;
sp->ux_errno = errno;
return (ret);
}
-if (scgp->debug > 0)
+if (usalp->debug > 0)
fprintf(stderr, "cdb_status: %X, size: %d xfer: %d\n", sctl_io.cdb_status, sctl_io.data_length, sctl_io.data_xfer);
if (sctl_io.cdb_status == 0 || sctl_io.cdb_status == 0x02)
Modified: cdrkit/trunk/libusal/scsi-linux-ata.c
===================================================================
--- cdrkit/trunk/libscg/scsi-linux-ata.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-linux-ata.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -20,10 +20,10 @@
*
* This is the interface for the broken Linux SCSI generic driver.
* This is a hack, that tries to emulate the functionality
- * of the scg driver.
+ * of the usal driver.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -57,34 +57,34 @@
#ifdef USE_ATA
-static char _scg_atrans_version[] = "scsi-linux-ata.c-1.7"; /* The version for ATAPI transport*/
+static char _usal_atrans_version[] = "scsi-linux-ata.c-1.7"; /* The version for ATAPI transport*/
-static char *scgo_aversion(SCSI *scgp, int what);
-static int scgo_ahelp(SCSI *scgp, FILE *f);
-static int scgo_aopen(SCSI *scgp, char *device);
-static int scgo_aclose(SCSI *scgp);
-static long scgo_amaxdma(SCSI *scgp, long amt);
-static BOOL scgo_ahavebus(SCSI *scgp, int);
-static int scgo_afileno(SCSI *scgp, int, int, int);
-static int scgo_ainitiator_id(SCSI *scgp);
-static int scgo_aisatapi(SCSI *scgp);
-static int scgo_areset(SCSI *scgp, int what);
-static int scgo_asend(SCSI *scgp);
+static char *usalo_aversion(SCSI *usalp, int what);
+static int usalo_ahelp(SCSI *usalp, FILE *f);
+static int usalo_aopen(SCSI *usalp, char *device);
+static int usalo_aclose(SCSI *usalp);
+static long usalo_amaxdma(SCSI *usalp, long amt);
+static BOOL usalo_ahavebus(SCSI *usalp, int);
+static int usalo_afileno(SCSI *usalp, int, int, int);
+static int usalo_ainitiator_id(SCSI *usalp);
+static int usalo_aisatapi(SCSI *usalp);
+static int usalo_areset(SCSI *usalp, int what);
+static int usalo_asend(SCSI *usalp);
-static scg_ops_t ata_ops = {
- scgo_asend,
- scgo_aversion,
- scgo_ahelp,
- scgo_aopen,
- scgo_aclose,
- scgo_amaxdma,
- scgo_getbuf, /* Shared with SG driver */
- scgo_freebuf, /* Shared with SG driver */
- scgo_ahavebus,
- scgo_afileno,
- scgo_ainitiator_id,
- scgo_aisatapi,
- scgo_areset,
+static usal_ops_t ata_ops = {
+ usalo_asend,
+ usalo_aversion,
+ usalo_ahelp,
+ usalo_aopen,
+ usalo_aclose,
+ usalo_amaxdma,
+ usalo_getbuf, /* Shared with SG driver */
+ usalo_freebuf, /* Shared with SG driver */
+ usalo_ahavebus,
+ usalo_afileno,
+ usalo_ainitiator_id,
+ usalo_aisatapi,
+ usalo_areset,
};
#define HOST_EMPTY 0xF
@@ -96,21 +96,21 @@
#define HOST_OTHER 0xE
-#define typlocal(p, schillybus) scglocal(p)->bc[schillybus].typ
-#define buslocal(p, schillybus) scglocal(p)->bc[schillybus].bus
-#define hostlocal(p, schillybus) scglocal(p)->bc[schillybus].host
+#define typlocal(p, schillybus) usallocal(p)->bc[schillybus].typ
+#define buslocal(p, schillybus) usallocal(p)->bc[schillybus].bus
+#define hostlocal(p, schillybus) usallocal(p)->bc[schillybus].host
#define MAX_DMA_ATA (131072-1) /* EINVAL (hart) ENOMEM (weich) bei mehr ... */
/* Bei fehlerhaftem Sense Pointer kommt EFAULT */
-static int scgo_send(SCSI * scgp);
-static BOOL sg_amapdev(SCSI * scgp, int f, char *device, int *bus,
+static int usalo_send(SCSI * usalp);
+static BOOL sg_amapdev(SCSI * usalp, int f, char *device, int *bus,
int *target, int *lun);
-static BOOL sg_amapdev_scsi(SCSI * scgp, int f, int *busp, int *tgtp,
+static BOOL sg_amapdev_scsi(SCSI * usalp, int f, int *busp, int *tgtp,
int *lunp, int *chanp, int *inop);
-static int scgo_aget_first_free_shillybus(SCSI * scgp, int subsystem,
+static int usalo_aget_first_free_shillybus(SCSI * usalp, int subsystem,
int host, int bus);
-static int scgo_amerge(char *path, char *readedlink, char *buffer, int buflen);
+static int usalo_amerge(char *path, char *readedlink, char *buffer, int buflen);
/*
* uncomment this when you will get a debug file #define DEBUG
@@ -142,7 +142,7 @@
#define log(a)
#endif /* DEBUG */
-static int scan_internal(SCSI * scgp, int *fatal);
+static int scan_internal(SCSI * usalp, int *fatal);
/*
* Return version information for the low level SCSI transport code.
@@ -150,19 +150,19 @@
* in applications.
*/
static char *
-scgo_aversion(SCSI *scgp, int what)
+usalo_aversion(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_atrans_version);
+ return (_usal_atrans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (ata_sccsid);
}
@@ -171,19 +171,19 @@
}
static int
-scgo_ahelp(SCSI *scgp, FILE *f)
+usalo_ahelp(SCSI *usalp, FILE *f)
{
- __scg_help(f, "ATA", "ATA Packet specific SCSI transport",
+ __usal_help(f, "ATA", "ATA Packet specific SCSI transport",
"ATAPI:", "bus,target,lun", "ATAPI:1,2,0", TRUE, FALSE);
return (0);
}
static int
-scgo_aopen(SCSI *scgp, char *device)
+usalo_aopen(SCSI *usalp, char *device)
{
- int bus = scg_scsibus(scgp);
- int target = scg_target(scgp);
- int lun = scg_lun(scgp);
+ int bus = usal_scsibus(usalp);
+ int target = usal_target(usalp);
+ int lun = usal_lun(usalp);
register int f;
register int b;
@@ -191,9 +191,9 @@
register int l;
int nopen = 0;
- if (scgp->overbose)
+ if (usalp->overbose)
fprintf(stderr, "Warning: Using ATA Packet interface.\n");
- if (scgp->overbose) {
+ if (usalp->overbose) {
fprintf(stderr, "Warning: The related Linux kernel interface code seems to be unmaintained.\n");
fprintf(stderr, "Warning: There is absolutely NO DMA, operations thus are slow.\n");
}
@@ -201,35 +201,35 @@
log(("\n<<<<<<<<<<<<<<<< LOGGING ON >>>>>>>>>>>>>>>>>\n"));
if (bus >= MAX_SCHILLY_HOSTS || target >= MAX_TGT || lun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for bus, target or lun '%d,%d,%d'",
bus, target, lun);
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL) {
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL) {
return (0);
}
- scglocal(scgp)->scgfile = -1;
- scglocal(scgp)->pgbus = -2;
- scglocal(scgp)->SCSIbuf = (char *)-1;
- scglocal(scgp)->pack_id = 5;
- scglocal(scgp)->drvers = -1;
- scglocal(scgp)->isold = -1;
- scglocal(scgp)->xbufsize = 0L;
- scglocal(scgp)->xbuf = NULL;
+ usallocal(usalp)->usalfile = -1;
+ usallocal(usalp)->pgbus = -2;
+ usallocal(usalp)->SCSIbuf = (char *)-1;
+ usallocal(usalp)->pack_id = 5;
+ usallocal(usalp)->drvers = -1;
+ usallocal(usalp)->isold = -1;
+ usallocal(usalp)->xbufsize = 0L;
+ usallocal(usalp)->xbuf = NULL;
for (b = 0; b < MAX_SCHILLY_HOSTS; b++) {
- typlocal(scgp, b) = HOST_EMPTY;
+ typlocal(usalp, b) = HOST_EMPTY;
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->scgfiles[b][t][l] = (short) -1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short) -1;
}
}
}
@@ -242,9 +242,9 @@
goto openbydev;
atascan:
- if (scan_internal(scgp, &nopen)) {
- if (scgp->errstr)
- js_printf(scgp->errstr, "INFO: scan_internal(...) failed");
+ if (scan_internal(usalp, &nopen)) {
+ if (usalp->errstr)
+ js_printf(usalp->errstr, "INFO: scan_internal(...) failed");
return (-1);
}
return (nopen);
@@ -252,8 +252,8 @@
openbydev:
if (device != NULL && strncmp(device, "ATAPI:", 6) == 0)
device += 6;
- if (scgp->debug > 3) {
- js_fprintf((FILE *) scgp->errfile, "INFO: do scgo_open openbydev");
+ if (usalp->debug > 3) {
+ js_fprintf((FILE *) usalp->errfile, "INFO: do usalo_open openbydev");
}
if (device != NULL && *device != '\0') {
int schilly_bus,
@@ -263,13 +263,13 @@
f = sg_open_excl(device, O_RDONLY | O_NONBLOCK);
if (f < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'", device);
return (0);
}
- if (sg_amapdev(scgp, f, device, &schilly_bus, &starget, &slun)) {
- scg_settarget(scgp, schilly_bus, starget, slun);
+ if (sg_amapdev(usalp, f, device, &schilly_bus, &starget, &slun)) {
+ usal_settarget(usalp, schilly_bus, starget, slun);
return (++nopen);
}
}
@@ -277,7 +277,7 @@
}
static int
-scan_internal(SCSI *scgp, int *nopen)
+scan_internal(SCSI *usalp, int *nopen)
{
int i,
f;
@@ -298,42 +298,42 @@
sprintf(device, "/dev/cdroms/cdrom%i", i);
if ((f = open(device, O_RDONLY | O_NONBLOCK)) < 0) {
if (errno != ENOENT && errno != ENXIO && errno != ENODEV && errno != EACCES) {
- if (scgp->debug > 4) {
- js_fprintf((FILE *) scgp->errfile,
+ if (usalp->debug > 4) {
+ js_fprintf((FILE *) usalp->errfile,
"try open(%s) return %i, errno %i, cancel\n", device, f, errno);
}
return (-2);
} else if (errno == ENOENT || errno == ENODEV) {
- if (scgp->debug > 4) {
- js_fprintf((FILE *) scgp->errfile,
+ if (usalp->debug > 4) {
+ js_fprintf((FILE *) usalp->errfile,
"try open(%s) return %i, errno %i\n", device, f, errno);
}
if (0 == i) {
DEVFS = FALSE;
- if (scgp->debug > 4) {
- js_fprintf((FILE *) scgp->errfile,
+ if (usalp->debug > 4) {
+ js_fprintf((FILE *) usalp->errfile,
"DEVFS not detected, continuing with old dev\n");
}
}
break;
}
- if (scgp->debug > 4) {
+ if (usalp->debug > 4) {
if (errno == EACCES) {
- js_fprintf((FILE *) scgp->errfile,
+ js_fprintf((FILE *) usalp->errfile,
"errno (EACCESS), you don't have the needed rights for %s\n",
device);
}
- js_fprintf((FILE *) scgp->errfile,
+ js_fprintf((FILE *) usalp->errfile,
"try open(%s) return %i, errno %i, trying next cdrom\n",
device, f, errno);
}
} else {
- if (scgp->debug > 4) {
- js_fprintf((FILE *) scgp->errfile,
+ if (usalp->debug > 4) {
+ js_fprintf((FILE *) usalp->errfile,
"try open(%s) return %i errno %i calling sg_mapdev(...)\n",
device, f, errno);
}
- if (sg_amapdev(scgp, f, device, &schilly_bus, &target, &lun)) {
+ if (sg_amapdev(usalp, f, device, &schilly_bus, &target, &lun)) {
(++(*nopen));
} else {
close(f);
@@ -347,8 +347,8 @@
sprintf(device, "/dev/sr%i", i);
if ((f = open(device, O_RDONLY | O_NONBLOCK)) < 0) {
if (errno != ENOENT && errno != ENXIO && errno != ENODEV && errno != EACCES) {
- if (scgp->debug > 4) {
- js_fprintf((FILE *) scgp->errfile,
+ if (usalp->debug > 4) {
+ js_fprintf((FILE *) usalp->errfile,
"try open(%s) return %i, errno %i, cancel\n",
device, f, errno);
}
@@ -357,7 +357,7 @@
break;
}
} else {
- if (sg_amapdev(scgp, f, device, &schilly_bus, &target, &lun)) {
+ if (sg_amapdev(usalp, f, device, &schilly_bus, &target, &lun)) {
(++(*nopen));
} else {
close(f);
@@ -370,8 +370,8 @@
sprintf(device, "/dev/hd%c", i);
if ((f = open(device, O_RDONLY | O_NONBLOCK)) < 0) {
if (errno != ENOENT && errno != ENXIO && errno != EACCES) {
- if (scgp->debug > 4) {
- js_fprintf((FILE *) scgp->errfile,
+ if (usalp->debug > 4) {
+ js_fprintf((FILE *) usalp->errfile,
"try open(%s) return %i, errno %i, cancel\n",
device, f, errno);
}
@@ -382,13 +382,13 @@
} else {
/* ugly hack, make better, when you can. Alex */
if (0 > ioctl(f, CDROM_DRIVE_STATUS, CDSL_CURRENT)) {
- if (scgp->debug > 4) {
- js_fprintf((FILE *) scgp->errfile,
+ if (usalp->debug > 4) {
+ js_fprintf((FILE *) usalp->errfile,
"%s is not a cdrom, skipping\n",
device);
}
close(f);
- } else if (sg_amapdev(scgp, f, device, &schilly_bus, &target, &lun)) {
+ } else if (sg_amapdev(usalp, f, device, &schilly_bus, &target, &lun)) {
(++(*nopen));
} else {
close(f);
@@ -400,39 +400,39 @@
}
static int
-scgo_aclose(SCSI *scgp)
+usalo_aclose(SCSI *usalp)
{
register int f;
register int h;
register int t;
register int l;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
for (h = 0; h < MAX_SCHILLY_HOSTS; h++) {
- typlocal(scgp, h) = (HOST_EMPTY);
+ typlocal(usalp, h) = (HOST_EMPTY);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- f = scglocal(scgp)->scgfiles[h][t][l];
+ f = usallocal(usalp)->usalfiles[h][t][l];
if (f >= 0)
close(f);
- scglocal(scgp)->scgfiles[h][t][l] = (short) -1;
+ usallocal(usalp)->usalfiles[h][t][l] = (short) -1;
}
}
}
- if (scglocal(scgp)->xbuf != NULL) {
- free(scglocal(scgp)->xbuf);
- scglocal(scgp)->xbufsize = 0L;
- scglocal(scgp)->xbuf = NULL;
+ if (usallocal(usalp)->xbuf != NULL) {
+ free(usallocal(usalp)->xbuf);
+ usallocal(usalp)->xbufsize = 0L;
+ usallocal(usalp)->xbuf = NULL;
}
log(("<<<<<<<<<<<<<<<< LOGGING OFF >>>>>>>>>>>>>>>>>\n\n"));
return (0);
}
static int
-scgo_aget_first_free_shillybus(SCSI *scgp, int subsystem, int host, int bus)
+usalo_aget_first_free_shillybus(SCSI *usalp, int subsystem, int host, int bus)
{
int first_free_schilly_bus;
@@ -440,15 +440,15 @@
first_free_schilly_bus < MAX_SCHILLY_HOSTS;
first_free_schilly_bus++) {
- if (typlocal(scgp, first_free_schilly_bus) == HOST_EMPTY ||
- (typlocal(scgp, first_free_schilly_bus) == subsystem &&
- hostlocal(scgp, first_free_schilly_bus) == host &&
- buslocal(scgp, first_free_schilly_bus) == bus))
+ if (typlocal(usalp, first_free_schilly_bus) == HOST_EMPTY ||
+ (typlocal(usalp, first_free_schilly_bus) == subsystem &&
+ hostlocal(usalp, first_free_schilly_bus) == host &&
+ buslocal(usalp, first_free_schilly_bus) == bus))
break;
}
if (first_free_schilly_bus >= MAX_SCHILLY_HOSTS) {
- errmsgno(EX_BAD, "ERROR: in scgo_get_first_free_shillybus(...). Too many CDROMs, more than %i",
+ errmsgno(EX_BAD, "ERROR: in usalo_get_first_free_shillybus(...). Too many CDROMs, more than %i",
MAX_SCHILLY_HOSTS);
errmsgno(EX_BAD, "Increase MAX_SCHILLY_HOSTS in scsi-linux-ata.c and recompile!");
return (-1);
@@ -457,7 +457,7 @@
}
static int
-scgo_amerge(char *path, char *readedlink, char *buffer, int buflen)
+usalo_amerge(char *path, char *readedlink, char *buffer, int buflen)
{
char *aa;
@@ -595,7 +595,7 @@
*
*/
static BOOL
-sg_amapdev(SCSI *scgp, int f, char *device, int *schillybus, int *target,
+sg_amapdev(SCSI *usalp, int f, char *device, int *schillybus, int *target,
int *lun)
{
struct host {
@@ -671,7 +671,7 @@
if (result > 0 && result < LOCAL_MAX_PATH) {
tmp[result] = '\0';
- result = scgo_amerge(device, tmp, tmp1, LOCAL_MAX_PATH);
+ result = usalo_amerge(device, tmp, tmp1, LOCAL_MAX_PATH);
if (result > 0 && result < LOCAL_MAX_PATH) {
tmp1[result] = '\0';
strcpy(tmp, tmp1);
@@ -690,8 +690,8 @@
} else {
strncpy(tmp, device, sizeof (tmp));
}
- if (scgp->debug > 3) {
- js_fprintf((FILE *) scgp->errfile, "INFO: %s -> %s\n", device, tmp);
+ if (usalp->debug > 3) {
+ js_fprintf((FILE *) usalp->errfile, "INFO: %s -> %s\n", device, tmp);
}
memset(token, 0x00, sizeof (token));
i = 0;
@@ -783,17 +783,17 @@
Lun;
subsystem = HOST_SCSI;
- sg_amapdev_scsi(scgp, f, &Bus, &Target, &Lun, &Chan, &Ino);
+ sg_amapdev_scsi(usalp, f, &Bus, &Target, &Lun, &Chan, &Ino);
/* For old kernels try to make the best guess. */
#ifdef nonono
int n;
Ino |= Chan << 8;
- n = sg_mapbus(scgp, Bus, Ino);
+ n = sg_mapbus(usalp, Bus, Ino);
if (Bus == -1) {
Bus = n;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"SCSI Bus: %d (mapped from %d)\n",
Bus, Ino);
}
@@ -815,29 +815,29 @@
return (FALSE);
}
- if (scgp->verbose)
- js_printf(scgp->errstr, "INFO: subsystem %s: h %i, b %i, t %i, l %i",
+ if (usalp->verbose)
+ js_printf(usalp->errstr, "INFO: subsystem %s: h %i, b %i, t %i, l %i",
token[ID_TOKEN_SUBSYSTEM], h, b, t, l);
- first_free_schilly_bus = scgo_aget_first_free_shillybus(scgp, subsystem, h, b);
+ first_free_schilly_bus = usalo_aget_first_free_shillybus(usalp, subsystem, h, b);
if (-1 == first_free_schilly_bus) {
return (FALSE);
}
- if (scglocal(scgp)->scgfiles[first_free_schilly_bus][t][l] != (-1)) {
+ if (usallocal(usalp)->usalfiles[first_free_schilly_bus][t][l] != (-1)) {
errmsgno(EX_BAD, "ERROR: this cdrom is already mapped %s(%d,%d,%d)\n",
device, first_free_schilly_bus, t, l);
return (FALSE);
} else {
- scglocal(scgp)->scgfiles[first_free_schilly_bus][t][l] = f;
- typlocal(scgp, first_free_schilly_bus) = subsystem;
- hostlocal(scgp, first_free_schilly_bus) = h;
- buslocal(scgp, first_free_schilly_bus) = b;
+ usallocal(usalp)->usalfiles[first_free_schilly_bus][t][l] = f;
+ typlocal(usalp, first_free_schilly_bus) = subsystem;
+ hostlocal(usalp, first_free_schilly_bus) = h;
+ buslocal(usalp, first_free_schilly_bus) = b;
*schillybus = first_free_schilly_bus;
*target = t;
*lun = l;
- if (scgp->debug > 1) {
- js_fprintf((FILE *) scgp->errfile,
+ if (usalp->debug > 1) {
+ js_fprintf((FILE *) usalp->errfile,
"INFO: /dev/%s, (host%d/bus%d/target%d/lun%d) will be mapped on the schilly bus No %d (%d,%d,%d)\n",
token[ID_TOKEN_SUBSYSTEM], h, b, t, l,
first_free_schilly_bus, first_free_schilly_bus, t, l);
@@ -847,7 +847,7 @@
}
static BOOL
-sg_amapdev_scsi(SCSI *scgp, int f, int *busp, int *tgtp, int *lunp,
+sg_amapdev_scsi(SCSI *usalp, int f, int *busp, int *tgtp, int *lunp,
int *chanp, int *inop)
{
struct sg_id {
@@ -863,8 +863,8 @@
if (ioctl(f, SCSI_IOCTL_GET_IDLUN, &sg_id))
return (FALSE);
- if (scgp->debug > 0) {
- js_fprintf((FILE *) scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *) usalp->errfile,
"INFO: l1: 0x%lX l2: 0x%lX\n", sg_id.l1, sg_id.l2);
}
if (ioctl(f, SCSI_IOCTL_GET_BUS_NUMBER, &Bus) < 0) {
@@ -874,8 +874,8 @@
Lun = (sg_id.l1 >> 8) & 0xFF;
Chan = (sg_id.l1 >> 16) & 0xFF;
Ino = (sg_id.l1 >> 24) & 0xFF;
- if (scgp->debug > 0) {
- js_fprintf((FILE *) scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *) usalp->errfile,
"INFO: Bus: %d Target: %d Lun: %d Chan: %d Ino: %d\n",
Bus, Target, Lun, Chan, Ino);
}
@@ -890,7 +890,7 @@
}
static long
-scgo_amaxdma(SCSI *scgp, long amt)
+usalo_amaxdma(SCSI *usalp, long amt)
{
/*
* EINVAL (hart) ENOMEM (weich) bei mehr ...
@@ -900,7 +900,7 @@
}
static BOOL
-scgo_ahavebus(SCSI *scgp, int busno)
+usalo_ahavebus(SCSI *usalp, int busno)
{
register int t;
register int l;
@@ -908,43 +908,43 @@
if (busno < 0 || busno >= MAX_SCHILLY_HOSTS)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- if (scglocal(scgp)->scgfiles[busno][t][l] >= 0)
+ if (usallocal(usalp)->usalfiles[busno][t][l] >= 0)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_afileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_afileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= MAX_SCHILLY_HOSTS ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((int) scglocal(scgp)->scgfiles[busno][tgt][tlun]);
+ return ((int) usallocal(usalp)->usalfiles[busno][tgt][tlun]);
}
static int
-scgo_ainitiator_id(SCSI *scgp)
+usalo_ainitiator_id(SCSI *usalp)
{
- js_printf(scgp->errstr, "NOT IMPELEMENTED: scgo_initiator_id");
+ js_printf(usalp->errstr, "NOT IMPELEMENTED: usalo_initiator_id");
return (-1);
}
static int
-scgo_aisatapi(SCSI *scgp)
+usalo_aisatapi(SCSI *usalp)
{
- int schillybus = scgp->addr.scsibus;
- int typ = typlocal(scgp, schillybus);
+ int schillybus = usalp->addr.scsibus;
+ int typ = typlocal(usalp, schillybus);
if (typ == HOST_EMPTY)
return (-1);
if (typ != HOST_SCSI)
@@ -954,7 +954,7 @@
}
static int
-scgo_areset(SCSI *scgp, int what)
+usalo_areset(SCSI *usalp, int what)
{
if (what == SCG_RESET_NOP)
return (0);
@@ -966,9 +966,9 @@
}
static int
-scgo_asend(SCSI *scgp)
+usalo_asend(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
int ret,
i;
struct cdrom_generic_command sg_cgc;
@@ -983,7 +983,7 @@
char *p;
#endif
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
sp->ux_errno = EIO;
return (0);
@@ -1053,11 +1053,11 @@
}
}
#endif /* DEBUG */
- if ((ret = ioctl(scgp->fd, CDROM_SEND_PACKET, &sg_cgc)) < 0)
+ if ((ret = ioctl(usalp->fd, CDROM_SEND_PACKET, &sg_cgc)) < 0)
sp->ux_errno = geterrno();
- if (ret < 0 && scgp->debug > 4) {
- js_fprintf((FILE *) scgp->errfile,
+ if (ret < 0 && usalp->debug > 4) {
+ js_fprintf((FILE *) usalp->errfile,
"ioctl(CDROM_SEND_PACKET) ret: %d\n", ret);
}
/*
Modified: cdrkit/trunk/libusal/scsi-linux-pg.c
===================================================================
--- cdrkit/trunk/libscg/scsi-linux-pg.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-linux-pg.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -18,10 +18,10 @@
/*
* Interface for the Linux PARIDE implementation.
*
- * We emulate the functionality of the scg driver, via the pg driver.
+ * We emulate the functionality of the usal driver, via the pg driver.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -50,16 +50,16 @@
#include <linux/pg.h>
#else
#include "pg.h" /* Use local version as Linux sometimes doesn't have */
-#endif /* installed. Now libscg always supports PP SCSI */
+#endif /* installed. Now libusal always supports PP SCSI */
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version_pg[] = "scsi-linux-pg.c-1.43"; /* The version for this transport*/
+static char _usal_trans_version_pg[] = "scsi-linux-pg.c-1.43"; /* The version for this transport*/
#ifdef USE_PG_ONLY
@@ -67,40 +67,40 @@
#define MAX_TGT 8
#define MAX_LUN 8
-struct scg_local {
- short scgfiles[MAX_SCG][MAX_TGT][MAX_LUN];
+struct usal_local {
+ short usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
short buscookies[MAX_SCG];
int pgbus;
char *SCSIbuf;
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
#else
-#define scgo_version pg_version
-#define scgo_help pg_help
-#define scgo_open pg_open
-#define scgo_close pg_close
-#define scgo_send pg_send
-#define scgo_maxdma pg_maxdma
-#define scgo_initiator_id pg_initiator_id
-#define scgo_isatapi pg_isatapi
-#define scgo_reset pg_reset
+#define usalo_version pg_version
+#define usalo_help pg_help
+#define usalo_open pg_open
+#define usalo_close pg_close
+#define usalo_send pg_send
+#define usalo_maxdma pg_maxdma
+#define usalo_initiator_id pg_initiator_id
+#define usalo_isatapi pg_isatapi
+#define usalo_reset pg_reset
-static char *pg_version(SCSI *scgp, int what);
-static int pg_help(SCSI *scgp, FILE *f);
-static int pg_open(SCSI *scgp, char *device);
-static int pg_close(SCSI *scgp);
-static long pg_maxdma(SCSI *scgp, long amt);
-static int pg_initiator_id(SCSI *scgp);
-static int pg_isatapi(SCSI *scgp);
-static int pg_reset(SCSI *scgp, int what);
-static int pg_send(SCSI *scgp);
+static char *pg_version(SCSI *usalp, int what);
+static int pg_help(SCSI *usalp, FILE *f);
+static int pg_open(SCSI *usalp, char *device);
+static int pg_close(SCSI *usalp);
+static long pg_maxdma(SCSI *usalp, long amt);
+static int pg_initiator_id(SCSI *usalp);
+static int pg_isatapi(SCSI *usalp);
+static int pg_reset(SCSI *usalp, int what);
+static int pg_send(SCSI *usalp);
#endif
-static int do_scg_cmd(SCSI *scgp, struct scg_cmd *sp);
-static int do_scg_sense(SCSI *scgp, struct scg_cmd *sp);
+static int do_usal_cmd(SCSI *usalp, struct usal_cmd *sp);
+static int do_usal_sense(SCSI *usalp, struct usal_cmd *sp);
/*
@@ -109,19 +109,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version_pg);
+ return (_usal_trans_version_pg);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (___sccsid);
}
@@ -130,19 +130,19 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "pg", "SCSI transport for ATAPI over Parallel Port",
+ __usal_help(f, "pg", "SCSI transport for ATAPI over Parallel Port",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
register int f;
register int b;
#ifdef USE_PG_ONLY
@@ -154,8 +154,8 @@
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
@@ -170,56 +170,56 @@
* XXX Should add extra space in buscookies for a "PP bus".
*/
- if (scglocal(scgp)->buscookies[MAX_SCG-1] != (short)-1)
+ if (usallocal(usalp)->buscookies[MAX_SCG-1] != (short)-1)
return (0); /* No space for pgbus */
for (b = MAX_SCG-1; b >= 0; b--) {
- if (scglocal(scgp)->buscookies[b] != (short)-1) {
- scglocal(scgp)->pgbus = ++b;
+ if (usallocal(usalp)->buscookies[b] != (short)-1) {
+ usallocal(usalp)->pgbus = ++b;
break;
}
}
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "PP Bus: %d\n", scglocal(scgp)->pgbus);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "PP Bus: %d\n", usallocal(usalp)->pgbus);
}
#else
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
- scglocal(scgp)->pgbus = -2;
- scglocal(scgp)->SCSIbuf = (char *)-1;
+ usallocal(usalp)->pgbus = -2;
+ usallocal(usalp)->SCSIbuf = (char *)-1;
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
#endif
- if (scglocal(scgp)->pgbus < 0)
- scglocal(scgp)->pgbus = 0;
+ if (usallocal(usalp)->pgbus < 0)
+ usallocal(usalp)->pgbus = 0;
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
goto openbydev;
if (busno >= 0 && tgt >= 0 && tlun >= 0) {
#ifndef USE_PG_ONLY
- if (scglocal(scgp)->pgbus != busno)
+ if (usallocal(usalp)->pgbus != busno)
return (0);
#endif
js_snprintf(devname, sizeof (devname), "/dev/pg%d", tgt);
f = sg_open_excl(devname, O_RDWR | O_NONBLOCK);
if (f < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'", devname);
return (0);
}
- scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
+ usallocal(usalp)->usalfiles[busno][tgt][tlun] = f;
return (1);
} else {
tlun = 0;
@@ -231,23 +231,23 @@
* Set up error string but let us clear it later
* if at least one open succeeded.
*/
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '/dev/pg*'");
if (errno != ENOENT && errno != ENXIO && errno != ENODEV) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'", devname);
return (0);
}
} else {
- scglocal(scgp)->scgfiles[scglocal(scgp)->pgbus][tgt][tlun] = f;
+ usallocal(usalp)->usalfiles[usallocal(usalp)->pgbus][tgt][tlun] = f;
nopen++;
}
}
}
- if (nopen > 0 && scgp->errstr)
- scgp->errstr[0] = '\0';
+ if (nopen > 0 && usalp->errstr)
+ usalp->errstr[0] = '\0';
openbydev:
if (device != NULL && *device != '\0') {
@@ -258,8 +258,8 @@
f = open(device, O_RDWR | O_NONBLOCK);
/* if (f < 0 && errno == ENOENT) {*/
if (f < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'",
device);
return (0);
@@ -269,8 +269,8 @@
tgt = *p - '0';
if (tgt < 0 || tgt > 9)
return (0);
- scglocal(scgp)->scgfiles[scglocal(scgp)->pgbus][tgt][tlun] = f;
- scg_settarget(scgp, scglocal(scgp)->pgbus, tgt, tlun);
+ usallocal(usalp)->usalfiles[usallocal(usalp)->pgbus][tgt][tlun] = f;
+ usal_settarget(usalp, usallocal(usalp)->pgbus, tgt, tlun);
return (++nopen);
}
@@ -278,33 +278,33 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
register int f;
register int b;
register int t;
register int l;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- if (scglocal(scgp)->pgbus < 0)
+ if (usallocal(usalp)->pgbus < 0)
return (0);
- b = scglocal(scgp)->pgbus;
- scglocal(scgp)->buscookies[b] = (short)-1;
+ b = usallocal(usalp)->pgbus;
+ usallocal(usalp)->buscookies[b] = (short)-1;
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- f = scglocal(scgp)->scgfiles[b][t][l];
+ f = usallocal(usalp)->usalfiles[b][t][l];
if (f >= 0)
close(f);
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
return (0);
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
return (PG_MAX_DATA);
}
@@ -312,34 +312,34 @@
#ifdef USE_PG_ONLY
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
char *ret;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
ret = valloc((size_t)(amt+getpagesize()));
if (ret == NULL)
return (ret);
- scgp->bufbase = ret;
+ usalp->bufbase = ret;
ret += getpagesize();
- scglocal(scgp)->SCSIbuf = ret;
+ usallocal(usalp)->SCSIbuf = ret;
return ((void *)ret);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
register int t;
register int l;
@@ -347,46 +347,46 @@
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- if (scglocal(scgp)->scgfiles[busno][t][l] >= 0)
+ if (usallocal(usalp)->usalfiles[busno][t][l] >= 0)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((int)scglocal(scgp)->scgfiles[busno][tgt][tlun]);
+ return ((int)usallocal(usalp)->usalfiles[busno][tgt][tlun]);
}
#endif /* USE_PG_ONLY */
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (TRUE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
struct pg_write_hdr hdr = {PG_MAGIC, PG_RESET, 0};
@@ -399,7 +399,7 @@
/*
* XXX Does this reset TGT or BUS ???
*/
- return (write(scgp->fd, (char *)&hdr, sizeof (hdr)));
+ return (write(usalp->fd, (char *)&hdr, sizeof (hdr)));
}
@@ -412,7 +412,7 @@
#define LEAD MAX(RHSIZE, WHSIZE)
static int
-do_scg_cmd(SCSI *scgp, struct scg_cmd *sp)
+do_usal_cmd(SCSI *usalp, struct usal_cmd *sp)
{
char local[LEAD+PG_MAX_DATA];
@@ -426,7 +426,7 @@
if (sp->cdb_len > 12)
comerrno(EX_BAD, "Can't do %d byte command.\n", sp->cdb_len);
- if (sp->addr == scglocal(scgp)->SCSIbuf) {
+ if (sp->addr == usallocal(usalp)->SCSIbuf) {
use_local = 0;
dbp = sp->addr;
} else {
@@ -455,7 +455,7 @@
if (!inward)
i += sp->size;
- r = write(scgp->fd, (char *)whp, i);
+ r = write(usalp->fd, (char *)whp, i);
if (r < 0) { /* command was not sent */
sp->ux_errno = geterrno();
@@ -473,13 +473,13 @@
}
if (r != i)
- errmsg("scgo_send(%s) wrote %d bytes (expected %d).\n",
- scgp->cmdname, r, i);
+ errmsg("usalo_send(%s) wrote %d bytes (expected %d).\n",
+ usalp->cmdname, r, i);
sp->ux_errno = 0;
sp->sense_count = 0;
- r = read(scgp->fd, (char *)rhp, RHSIZE+sp->size);
+ r = read(usalp->fd, (char *)rhp, RHSIZE+sp->size);
if (r < 0) {
sp->ux_errno = geterrno();
@@ -533,10 +533,10 @@
}
static int
-do_scg_sense(SCSI *scgp, struct scg_cmd *sp)
+do_usal_sense(SCSI *usalp, struct usal_cmd *sp)
{
int ret;
- struct scg_cmd s_cmd;
+ struct usal_cmd s_cmd;
fillbytes((caddr_t)&s_cmd, sizeof (s_cmd), '\0');
s_cmd.addr = (caddr_t)sp->u_sense.cmd_sense;
@@ -547,7 +547,7 @@
s_cmd.cdb.g0_cdb.cmd = SC_REQUEST_SENSE;
s_cmd.cdb.g0_cdb.lun = sp->cdb.g0_cdb.lun;
s_cmd.cdb.g0_cdb.count = sp->sense_len;
- ret = do_scg_cmd(scgp, &s_cmd);
+ ret = do_usal_cmd(usalp, &s_cmd);
if (ret < 0)
return (ret);
@@ -557,20 +557,20 @@
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
int ret;
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
- ret = do_scg_cmd(scgp, sp);
+ ret = do_usal_cmd(usalp, sp);
if (ret < 0)
return (ret);
if (sp->u_scb.cmd_scb[0] & 2)
- ret = do_scg_sense(scgp, sp);
+ ret = do_usal_sense(usalp, sp);
return (ret);
}
@@ -578,14 +578,14 @@
#ifndef USE_PG_ONLY
-#undef scgo_version
-#undef scgo_help
-#undef scgo_open
-#undef scgo_close
-#undef scgo_send
-#undef scgo_maxdma
-#undef scgo_initiator_id
-#undef scgo_isatapi
-#undef scgo_reset
+#undef usalo_version
+#undef usalo_help
+#undef usalo_open
+#undef usalo_close
+#undef usalo_send
+#undef usalo_maxdma
+#undef usalo_initiator_id
+#undef usalo_isatapi
+#undef usalo_reset
#endif
Modified: cdrkit/trunk/libusal/scsi-linux-sg.c
===================================================================
--- cdrkit/trunk/libscg/scsi-linux-sg.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-linux-sg.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -20,7 +20,7 @@
*
* This is the interface for the broken Linux SCSI generic driver.
* This is a hack, that tries to emulate the functionality
- * of the scg driver.
+ * of the usal driver.
*
* Design flaws of the sg driver:
* - cannot see if SCSI command could not be send
@@ -46,7 +46,7 @@
* are required.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -114,12 +114,12 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-linux-sg.c-1.86"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-linux-sg.c-1.86"; /* The version for this transport*/
#ifndef SCSI_IOCTL_GET_BUS_NUMBER
#define SCSI_IOCTL_GET_BUS_NUMBER 0x5386
@@ -158,7 +158,7 @@
#endif
/*
- * XXX Should add extra space in buscookies and scgfiles for a "PP bus"
+ * XXX Should add extra space in buscookies and usalfiles for a "PP bus"
* XXX and for two or more "ATAPI busses".
*/
#define MAX_SCG 256 /* Max # of SCSI controllers */
@@ -177,9 +177,9 @@
} ata_buscookies;
#endif
-struct scg_local {
- int scgfile; /* Used for SG_GET_BUFSIZE ioctl()*/
- short scgfiles[MAX_SCG][MAX_TGT][MAX_LUN];
+struct usal_local {
+ int usalfile; /* Used for SG_GET_BUFSIZE ioctl()*/
+ short usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
short buscookies[MAX_SCG];
int pgbus;
int pack_id; /* Should be a random number */
@@ -193,7 +193,7 @@
ata_buscookies bc[MAX_SCHILLY_HOSTS];
#endif
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
/*
* Flag definitions
@@ -227,19 +227,19 @@
#ifdef MISALIGN
static int sg_getint(int *ip);
#endif
-static int scgo_send(SCSI *scgp);
+static int usalo_send(SCSI *usalp);
#ifdef SG_IO
-static int sg_rwsend(SCSI *scgp);
+static int sg_rwsend(SCSI *usalp);
#endif
static void sg_clearnblock(int f);
-static BOOL sg_setup(SCSI *scgp, int f, int busno, int tgt, int tlun,
+static BOOL sg_setup(SCSI *usalp, int f, int busno, int tgt, int tlun,
int ataidx);
-static void sg_initdev(SCSI *scgp, int f);
-static int sg_mapbus(SCSI *scgp, int busno, int ino);
-static BOOL sg_mapdev(SCSI *scgp, int f, int *busp, int *tgtp, int *lunp,
+static void sg_initdev(SCSI *usalp, int f);
+static int sg_mapbus(SCSI *usalp, int busno, int ino);
+static BOOL sg_mapdev(SCSI *usalp, int f, int *busp, int *tgtp, int *lunp,
int *chanp, int *inop, int ataidx);
#if defined(SG_SET_RESERVED_SIZE) && defined(SG_GET_RESERVED_SIZE)
-static long sg_raisedma(SCSI *scgp, long newmax);
+static long sg_raisedma(SCSI *usalp, long newmax);
#endif
static void sg_settimeout(int f, int timeout);
@@ -270,29 +270,29 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
#ifdef USE_PG
/*
* If we only have a Parallel port or only opened a handle
* for PP, just return PP version.
*/
- if (scglocal(scgp)->pgbus == 0 ||
- (scg_scsibus(scgp) >= 0 &&
- scg_scsibus(scgp) == scglocal(scgp)->pgbus))
- return (pg_version(scgp, what));
+ if (usallocal(usalp)->pgbus == 0 ||
+ (usal_scsibus(usalp) >= 0 &&
+ usal_scsibus(usalp) == usallocal(usalp)->pgbus))
+ return (pg_version(usalp, what));
#endif
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
case SCG_KVERSION:
@@ -300,8 +300,8 @@
static char kv[16];
int n;
- if (scglocal(scgp)->drvers >= 0) {
- n = scglocal(scgp)->drvers;
+ if (usallocal(usalp)->drvers >= 0) {
+ n = usallocal(usalp)->drvers;
js_snprintf(kv, sizeof (kv),
"%d.%d.%d",
n/10000, (n%10000)/100, n%100);
@@ -315,27 +315,27 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "sg", "Generic transport independent SCSI",
+ __usal_help(f, "sg", "Generic transport independent SCSI",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
#ifdef USE_PG
- pg_help(scgp, f);
+ pg_help(usalp, f);
#endif
#ifdef USE_ATA
- scgo_ahelp(scgp, f);
+ usalo_ahelp(usalp, f);
#endif
- __scg_help(f, "ATA", "ATA Packet specific SCSI transport using sg interface",
+ __usal_help(f, "ATA", "ATA Packet specific SCSI transport using sg interface",
"ATA:", "bus,target,lun", "1,2,0", TRUE, FALSE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
register int f;
register int i;
register int b;
@@ -347,8 +347,8 @@
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
@@ -356,8 +356,8 @@
if (device != NULL && *device != '\0') {
#ifdef USE_ATA
if (strncmp(device, "ATAPI", 5) == 0) {
- scgp->ops = &ata_ops;
- return (SCGO_OPEN(scgp, device));
+ usalp->ops = &ata_ops;
+ return (SCGO_OPEN(usalp, device));
}
#endif
if (strcmp(device, "ATA") == 0) {
@@ -378,44 +378,44 @@
use_ata = TRUE;
device = NULL;
#if 0 // WTF, stop spamming
- if (scgp->overbose) {
+ if (usalp->overbose) {
/*
* I strongly encourage people who believe that
* they need to patch this message away to read
- * the messages in the Solaris USCSI libscg
+ * the messages in the Solaris USCSI libusal
* layer instead of wetting their tissues while
* being unwilling to look besides their
* own belly button.
*/
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"#########################################################################################\n#\n# Warning: Using ATAPI via /dev/hd* interface. Use dev=ATA:X,Y,Z or dev=/dev/hdX\n\#\n#########################################################################################\n");
}
#endif
}
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
- scglocal(scgp)->scgfile = -1;
- scglocal(scgp)->pgbus = -2;
- scglocal(scgp)->SCSIbuf = (char *)-1;
- scglocal(scgp)->pack_id = 5;
- scglocal(scgp)->drvers = -1;
- scglocal(scgp)->isold = -1;
- scglocal(scgp)->flags = 0;
+ usallocal(usalp)->usalfile = -1;
+ usallocal(usalp)->pgbus = -2;
+ usallocal(usalp)->SCSIbuf = (char *)-1;
+ usallocal(usalp)->pack_id = 5;
+ usallocal(usalp)->drvers = -1;
+ usallocal(usalp)->isold = -1;
+ usallocal(usalp)->flags = 0;
if (use_ata)
- scglocal(scgp)->flags |= LF_ATA;
- scglocal(scgp)->xbufsize = 0L;
- scglocal(scgp)->xbuf = NULL;
+ usallocal(usalp)->flags |= LF_ATA;
+ usallocal(usalp)->xbufsize = 0L;
+ usallocal(usalp)->xbuf = NULL;
for (b = 0; b < MAX_SCG; b++) {
- scglocal(scgp)->buscookies[b] = (short)-1;
+ usallocal(usalp)->buscookies[b] = (short)-1;
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -446,12 +446,12 @@
* Set up error string but let us clear it later
* if at least one open succeeded.
*/
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '/dev/hd*'");
if (errno != ENOENT && errno != ENXIO && errno != ENODEV) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'", devname);
/* return (0); */
continue;
@@ -460,14 +460,14 @@
int iparm;
if (ioctl(f, SG_GET_TIMEOUT, &iparm) < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"SCSI unsupported with '/dev/hd*'");
close(f);
continue;
}
sg_clearnblock(f); /* Be very proper about this */
- if (sg_setup(scgp, f, busno, tgt, tlun, i))
+ if (sg_setup(usalp, f, busno, tgt, tlun, i))
return (++nopen);
if (busno < 0 && tgt < 0 && tlun < 0)
nopen++;
@@ -475,8 +475,8 @@
}
if (use_ata && nopen == 0)
return (0);
- if (nopen > 0 && scgp->errstr)
- scgp->errstr[0] = '\0';
+ if (nopen > 0 && usalp->errstr)
+ usalp->errstr[0] = '\0';
if (nopen == 0) for (i = 0; i < 32; i++) {
js_snprintf(devname, sizeof (devname), "/dev/sg%d", i);
@@ -487,27 +487,27 @@
* Set up error string but let us clear it later
* if at least one open succeeded.
*/
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '/dev/sg*'");
if(errno == EACCES || errno==EPERM)
continue;
if (errno != ENOENT && errno != ENXIO && errno != ENODEV) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'", devname);
return (0);
}
} else {
sg_clearnblock(f); /* Be very proper about this */
- if (sg_setup(scgp, f, busno, tgt, tlun, -1))
+ if (sg_setup(usalp, f, busno, tgt, tlun, -1))
return (++nopen);
if (busno < 0 && tgt < 0 && tlun < 0)
nopen++;
}
}
- if (nopen > 0 && scgp->errstr)
- scgp->errstr[0] = '\0';
+ if (nopen > 0 && usalp->errstr)
+ usalp->errstr[0] = '\0';
if (nopen == 0) for (i = 0; i <= 25; i++) {
js_snprintf(devname, sizeof (devname), "/dev/sg%c", i+'a');
@@ -518,27 +518,27 @@
* Set up error string but let us clear it later
* if at least one open succeeded.
*/
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '/dev/sg*'");
if(errno == EACCES || errno==EPERM)
continue;
if (errno != ENOENT && errno != ENXIO && errno != ENODEV) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'", devname);
return (0);
}
} else {
sg_clearnblock(f); /* Be very proper about this */
- if (sg_setup(scgp, f, busno, tgt, tlun, -1))
+ if (sg_setup(usalp, f, busno, tgt, tlun, -1))
return (++nopen);
if (busno < 0 && tgt < 0 && tlun < 0)
nopen++;
}
}
- if (nopen > 0 && scgp->errstr)
- scgp->errstr[0] = '\0';
+ if (nopen > 0 && usalp->errstr)
+ usalp->errstr[0] = '\0';
openbydev:
if (device != NULL && *device != '\0') {
@@ -559,15 +559,15 @@
* to use openbydev. If we cannot open the device, it
* makes no sense to try the /dev/pg* driver.
*/
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'",
device);
return (0);
}
sg_clearnblock(f); /* Be very proper about this */
- if (!sg_mapdev(scgp, f, &busno, &tgt, &tlun, 0, 0, b)) {
+ if (!sg_mapdev(usalp, f, &busno, &tgt, &tlun, 0, 0, b)) {
close(f);
/*
* If sg_mapdev() failes, this may be /dev/pg* device.
@@ -576,32 +576,32 @@
}
#ifdef OOO
- if (scg_scsibus(scgp) < 0)
- scg_scsibus(scgp) = busno;
- if (scg_target(scgp) < 0)
- scg_target(scgp) = tgt;
- if (scg_lun(scgp) < 0)
- scg_lun(scgp) = tlun;
+ if (usal_scsibus(usalp) < 0)
+ usal_scsibus(usalp) = busno;
+ if (usal_target(usalp) < 0)
+ usal_target(usalp) = tgt;
+ if (usal_lun(usalp) < 0)
+ usal_lun(usalp) = tlun;
#endif
- scg_settarget(scgp, busno, tgt, tlun);
- if (sg_setup(scgp, f, busno, tgt, tlun, b))
+ usal_settarget(usalp, busno, tgt, tlun);
+ if (sg_setup(usalp, f, busno, tgt, tlun, b))
return (++nopen);
}
openpg:
#ifdef USE_PG
- nopen += pg_open(scgp, device);
+ nopen += pg_open(usalp, device);
#endif
- if (scgp->debug > 0) for (b = 0; b < MAX_SCG; b++) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) for (b = 0; b < MAX_SCG; b++) {
+ js_fprintf((FILE *)usalp->errfile,
"Bus: %d cookie: %X\n",
- b, scglocal(scgp)->buscookies[b]);
+ b, usallocal(usalp)->buscookies[b]);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- if (scglocal(scgp)->scgfiles[b][t][l] != (short)-1) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usallocal(usalp)->usalfiles[b][t][l] != (short)-1) {
+ js_fprintf((FILE *)usalp->errfile,
"file (%d,%d,%d): %d\n",
- b, t, l, scglocal(scgp)->scgfiles[b][t][l]);
+ b, t, l, usallocal(usalp)->usalfiles[b][t][l]);
}
}
}
@@ -610,36 +610,36 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
register int f;
register int b;
register int t;
register int l;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
for (b = 0; b < MAX_SCG; b++) {
- if (b == scglocal(scgp)->pgbus)
+ if (b == usallocal(usalp)->pgbus)
continue;
- scglocal(scgp)->buscookies[b] = (short)-1;
+ usallocal(usalp)->buscookies[b] = (short)-1;
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- f = scglocal(scgp)->scgfiles[b][t][l];
+ f = usallocal(usalp)->usalfiles[b][t][l];
if (f >= 0)
close(f);
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
- if (scglocal(scgp)->xbuf != NULL) {
- free(scglocal(scgp)->xbuf);
- scglocal(scgp)->xbufsize = 0L;
- scglocal(scgp)->xbuf = NULL;
+ if (usallocal(usalp)->xbuf != NULL) {
+ free(usallocal(usalp)->xbuf);
+ usallocal(usalp)->xbufsize = 0L;
+ usallocal(usalp)->xbuf = NULL;
}
#ifdef USE_PG
- pg_close(scgp);
+ pg_close(usalp);
#endif
return (0);
}
@@ -663,7 +663,7 @@
}
static BOOL
-sg_setup(SCSI *scgp, int f, int busno, int tgt, int tlun, int ataidx)
+sg_setup(SCSI *usalp, int f, int busno, int tgt, int tlun, int ataidx)
{
int n;
int Chan;
@@ -674,32 +674,32 @@
BOOL onetarget = FALSE;
#ifdef SG_GET_VERSION_NUM
- if (scglocal(scgp)->drvers < 0) {
- scglocal(scgp)->drvers = 0;
+ if (usallocal(usalp)->drvers < 0) {
+ usallocal(usalp)->drvers = 0;
if (ioctl(f, SG_GET_VERSION_NUM, &n) >= 0) {
- scglocal(scgp)->drvers = n;
- if (scgp->overbose) {
- js_fprintf((FILE *)scgp->errfile,
+ usallocal(usalp)->drvers = n;
+ if (usalp->overbose) {
+ js_fprintf((FILE *)usalp->errfile,
"Linux sg driver version: %d.%d.%d\n",
n/10000, (n%10000)/100, n%100);
}
}
}
#endif
- if (scg_scsibus(scgp) >= 0 && scg_target(scgp) >= 0 && scg_lun(scgp) >= 0)
+ if (usal_scsibus(usalp) >= 0 && usal_target(usalp) >= 0 && usal_lun(usalp) >= 0)
onetarget = TRUE;
- sg_mapdev(scgp, f, &Bus, &Target, &Lun, &Chan, &Ino, ataidx);
+ sg_mapdev(usalp, f, &Bus, &Target, &Lun, &Chan, &Ino, ataidx);
/*
* For old kernels try to make the best guess.
*/
Ino |= Chan << 8;
- n = sg_mapbus(scgp, Bus, Ino);
+ n = sg_mapbus(usalp, Bus, Ino);
if (Bus == -1) {
Bus = n;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"SCSI Bus: %d (mapped from %d)\n", Bus, Ino);
}
}
@@ -709,16 +709,16 @@
return (FALSE);
}
- if (scglocal(scgp)->scgfiles[Bus][Target][Lun] == (short)-1)
- scglocal(scgp)->scgfiles[Bus][Target][Lun] = (short)f;
+ if (usallocal(usalp)->usalfiles[Bus][Target][Lun] == (short)-1)
+ usallocal(usalp)->usalfiles[Bus][Target][Lun] = (short)f;
if (onetarget) {
if (Bus == busno && Target == tgt && Lun == tlun) {
- sg_initdev(scgp, f);
- scglocal(scgp)->scgfile = f; /* remember file for ioctl's */
+ sg_initdev(usalp, f);
+ usallocal(usalp)->usalfile = f; /* remember file for ioctl's */
return (TRUE);
} else {
- scglocal(scgp)->scgfiles[Bus][Target][Lun] = (short)-1;
+ usallocal(usalp)->usalfiles[Bus][Target][Lun] = (short)-1;
close(f);
}
} else {
@@ -727,15 +727,15 @@
* fail because we set the default timeout and clear command
* queues (in case of the old sg driver interface).
*/
- sg_initdev(scgp, f);
- if (scglocal(scgp)->scgfile < 0)
- scglocal(scgp)->scgfile = f; /* remember file for ioctl's */
+ sg_initdev(usalp, f);
+ if (usallocal(usalp)->usalfile < 0)
+ usallocal(usalp)->usalfile = f; /* remember file for ioctl's */
}
return (FALSE);
}
static void
-sg_initdev(SCSI *scgp, int f)
+sg_initdev(SCSI *usalp, int f)
{
struct sg_rep {
struct sg_header hd;
@@ -745,7 +745,7 @@
int i;
struct stat sb;
- sg_settimeout(f, scgp->deftimeout);
+ sg_settimeout(f, usalp->deftimeout);
/*
* If it's a block device, don't read.... pre Linux-2.4 /dev/sg*
@@ -789,7 +789,7 @@
}
static int
-sg_mapbus(SCSI *scgp, int busno, int ino)
+sg_mapbus(SCSI *usalp, int busno, int ino)
{
register int i;
@@ -801,28 +801,28 @@
* the controller (card) number. I case of multi SCSI bus
* cards we are lost.
*/
- if (scglocal(scgp)->buscookies[busno] == (short)-1) {
- scglocal(scgp)->buscookies[busno] = ino;
+ if (usallocal(usalp)->buscookies[busno] == (short)-1) {
+ usallocal(usalp)->buscookies[busno] = ino;
return (busno);
}
- if (scglocal(scgp)->buscookies[busno] != (short)ino)
+ if (usallocal(usalp)->buscookies[busno] != (short)ino)
errmsgno(EX_BAD, "Warning Linux Bus mapping botch.\n");
return (busno);
} else for (i = 0; i < MAX_SCG; i++) {
- if (scglocal(scgp)->buscookies[i] == (short)-1) {
- scglocal(scgp)->buscookies[i] = ino;
+ if (usallocal(usalp)->buscookies[i] == (short)-1) {
+ usallocal(usalp)->buscookies[i] = ino;
return (i);
}
- if (scglocal(scgp)->buscookies[i] == ino)
+ if (usallocal(usalp)->buscookies[i] == ino)
return (i);
}
return (0);
}
static BOOL
-sg_mapdev(SCSI *scgp, int f, int *busp, int *tgtp, int *lunp, int *chanp,
+sg_mapdev(SCSI *usalp, int f, int *busp, int *tgtp, int *lunp, int *chanp,
int *inop, int ataidx)
{
struct sg_id {
@@ -851,8 +851,8 @@
}
if (ioctl(f, SCSI_IOCTL_GET_IDLUN, &sg_id))
return (FALSE);
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"l1: 0x%lX l2: 0x%lX\n", sg_id.l1, sg_id.l2);
}
if (ioctl(f, SCSI_IOCTL_GET_BUS_NUMBER, &Bus) < 0) {
@@ -863,8 +863,8 @@
Lun = (sg_id.l1 >> 8) & 0xFF;
Chan = (sg_id.l1 >> 16) & 0xFF;
Ino = (sg_id.l1 >> 24) & 0xFF;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"Bus: %d Target: %d Lun: %d Chan: %d Ino: %d\n",
Bus, Target, Lun, Chan, Ino);
}
@@ -891,7 +891,7 @@
* is to use SG_GET_RESERVED_SIZE to read back the current values.
*/
static long
-sg_raisedma(SCSI *scgp, long newmax)
+sg_raisedma(SCSI *usalp, long newmax)
{
register int b;
register int t;
@@ -910,7 +910,7 @@
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- if ((f = SCGO_FILENO(scgp, b, t, l)) < 0)
+ if ((f = SCGO_FILENO(usalp, b, t, l)) < 0)
continue;
old = 0;
if (ioctl(f, SG_GET_RESERVED_SIZE, &old) < 0)
@@ -930,7 +930,7 @@
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- if ((f = SCGO_FILENO(scgp, b, t, l)) < 0)
+ if ((f = SCGO_FILENO(usalp, b, t, l)) < 0)
continue;
old = 0;
if (ioctl(f, SG_GET_RESERVED_SIZE, &old) < 0)
@@ -949,12 +949,12 @@
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- if ((f = SCGO_FILENO(scgp, b, t, l)) < 0)
+ if ((f = SCGO_FILENO(usalp, b, t, l)) < 0)
continue;
if (ioctl(f, SG_GET_RESERVED_SIZE, &val) < 0)
continue;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"Target (%d,%d,%d): DMA max %d old max: %ld\n",
b, t, l, val, newmax);
}
@@ -968,7 +968,7 @@
#endif
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
long maxdma = MAX_DMA_LINUX;
@@ -977,44 +977,44 @@
* Use the curious new kernel interface found on Linux >= 2.2.10
* This interface first appeared in 2.2.6 but it was not working.
*/
- if (scglocal(scgp)->drvers >= 20134)
- maxdma = sg_raisedma(scgp, amt);
+ if (usallocal(usalp)->drvers >= 20134)
+ maxdma = sg_raisedma(usalp, amt);
#endif
#ifdef SG_GET_BUFSIZE
/*
* We assume that all /dev/sg instances use the same
* maximum buffer size.
*/
- maxdma = ioctl(scglocal(scgp)->scgfile, SG_GET_BUFSIZE, 0);
+ maxdma = ioctl(usallocal(usalp)->usalfile, SG_GET_BUFSIZE, 0);
#endif
if (maxdma < 0) {
#ifdef USE_PG
/*
* If we only have a Parallel port, just return PP maxdma.
*/
- if (scglocal(scgp)->pgbus == 0)
- return (pg_maxdma(scgp, amt));
+ if (usallocal(usalp)->pgbus == 0)
+ return (pg_maxdma(usalp, amt));
#endif
- if (scglocal(scgp)->scgfile >= 0)
+ if (usallocal(usalp)->usalfile >= 0)
maxdma = MAX_DMA_LINUX;
}
#ifdef USE_PG
- if (scg_scsibus(scgp) == scglocal(scgp)->pgbus)
- return (pg_maxdma(scgp, amt));
- if ((scg_scsibus(scgp) < 0) && (pg_maxdma(scgp, amt) < maxdma))
- return (pg_maxdma(scgp, amt));
+ if (usal_scsibus(usalp) == usallocal(usalp)->pgbus)
+ return (pg_maxdma(usalp, amt));
+ if ((usal_scsibus(usalp) < 0) && (pg_maxdma(usalp, amt) < maxdma))
+ return (pg_maxdma(usalp, amt));
#endif
return (maxdma);
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
char *ret;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
/*
* For performance reason, we allocate pagesize()
@@ -1025,22 +1025,22 @@
ret = valloc((size_t)(amt+getpagesize()));
if (ret == NULL)
return (ret);
- scgp->bufbase = ret;
+ usalp->bufbase = ret;
ret += getpagesize();
- scglocal(scgp)->SCSIbuf = ret;
+ usallocal(usalp)->SCSIbuf = ret;
return ((void *)ret);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
register int t;
register int l;
@@ -1048,54 +1048,54 @@
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- if (scglocal(scgp)->scgfiles[busno][t][l] >= 0)
+ if (usallocal(usalp)->usalfiles[busno][t][l] >= 0)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((int)scglocal(scgp)->scgfiles[busno][tgt][tlun]);
+ return ((int)usallocal(usalp)->usalfiles[busno][tgt][tlun]);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
#ifdef USE_PG
- if (scg_scsibus(scgp) == scglocal(scgp)->pgbus)
- return (pg_initiator_id(scgp));
+ if (usal_scsibus(usalp) == usallocal(usalp)->pgbus)
+ return (pg_initiator_id(usalp));
#endif
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
#ifdef USE_PG
- if (scg_scsibus(scgp) == scglocal(scgp)->pgbus)
- return (pg_isatapi(scgp));
+ if (usal_scsibus(usalp) == usallocal(usalp)->pgbus)
+ return (pg_isatapi(usalp));
#endif
/*
* The /dev/hd* interface always returns TRUE for SG_EMULATED_HOST.
* So this is completely useless.
*/
- if (scglocal(scgp)->flags & LF_ATA)
+ if (usallocal(usalp)->flags & LF_ATA)
return (-1);
#ifdef SG_EMULATED_HOST
@@ -1107,7 +1107,7 @@
* XXX The badly designed /dev/hd* interface always
* XXX returns TRUE, even when used with e.g. /dev/sr0.
*/
- if (ioctl(scgp->fd, SG_EMULATED_HOST, &emulated) >= 0)
+ if (ioctl(usalp->fd, SG_EMULATED_HOST, &emulated) >= 0)
return (emulated != 0);
}
#endif
@@ -1115,15 +1115,15 @@
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
#ifdef SG_SCSI_RESET
- int f = scgp->fd;
+ int f = usalp->fd;
int func = -1;
#endif
#ifdef USE_PG
- if (scg_scsibus(scgp) == scglocal(scgp)->pgbus)
- return (pg_reset(scgp, what));
+ if (usal_scsibus(usalp) == usallocal(usalp)->pgbus)
+ return (pg_reset(usalp, what));
#endif
/*
* Do we have a SCSI reset in the Linux sg driver?
@@ -1195,20 +1195,20 @@
#ifdef SG_IO
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
int ret;
sg_io_hdr_t sg_io;
struct timeval to;
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
sp->ux_errno = EIO;
return (0);
}
- if (scglocal(scgp)->isold > 0) {
- return (sg_rwsend(scgp));
+ if (usallocal(usalp)->isold > 0) {
+ return (sg_rwsend(usalp));
}
fillbytes((caddr_t)&sg_io, sizeof (sg_io), '\0');
@@ -1233,9 +1233,9 @@
sg_io.timeout = sp->timeout*1000;
sg_io.flags |= SG_FLAG_DIRECT_IO;
- ret = ioctl(scgp->fd, SG_IO, &sg_io);
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ ret = ioctl(usalp->fd, SG_IO, &sg_io);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"ioctl ret: %d\n", ret);
}
@@ -1248,9 +1248,9 @@
* corect errno would be ENOTTY, we check for this errno too.
*/
if ((sp->ux_errno == ENOTTY || sp->ux_errno == EINVAL) &&
- scglocal(scgp)->isold < 0) {
- scglocal(scgp)->isold = 1;
- return (sg_rwsend(scgp));
+ usallocal(usalp)->isold < 0) {
+ usallocal(usalp)->isold = 1;
+ return (sg_rwsend(usalp));
}
if (sp->ux_errno == ENXIO ||
sp->ux_errno == EINVAL || sp->ux_errno == EACCES) {
@@ -1261,8 +1261,8 @@
sp->u_scb.cmd_scb[0] = sg_io.status;
sp->sense_count = sg_io.sb_len_wr;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"host_status: %02X driver_status: %02X\n",
sg_io.host_status, sg_io.driver_status);
}
@@ -1318,9 +1318,9 @@
break;
case DID_TIME_OUT:
- __scg_times(scgp);
+ __usal_times(usalp);
- if (sp->timeout > 1 && scgp->cmdstop->tv_sec == 0) {
+ if (sp->timeout > 1 && usalp->cmdstop->tv_sec == 0) {
sp->u_scb.cmd_scb[0] = 0;
sp->error = SCG_FATAL; /* a selection timeout */
} else {
@@ -1331,11 +1331,11 @@
default:
to.tv_sec = sp->timeout;
to.tv_usec = 500000;
- __scg_times(scgp);
+ __usal_times(usalp);
- if (scgp->cmdstop->tv_sec < to.tv_sec ||
- (scgp->cmdstop->tv_sec == to.tv_sec &&
- scgp->cmdstop->tv_usec < to.tv_usec)) {
+ if (usalp->cmdstop->tv_sec < to.tv_sec ||
+ (usalp->cmdstop->tv_sec == to.tv_sec &&
+ usalp->cmdstop->tv_usec < to.tv_usec)) {
sp->ux_errno = 0;
sp->error = SCG_TIMEOUT; /* a timeout */
@@ -1351,14 +1351,14 @@
return (0);
}
#else
-# define sg_rwsend scgo_send
+# define sg_rwsend usalo_send
#endif
static int
-sg_rwsend(SCSI *scgp)
+sg_rwsend(SCSI *usalp)
{
- int f = scgp->fd;
- struct scg_cmd *sp = scgp->scmd;
+ int f = usalp->fd;
+ struct usal_cmd *sp = usalp->scmd;
struct sg_rq *sgp;
struct sg_rq *sgp2;
int i;
@@ -1382,46 +1382,46 @@
return (0);
}
#ifdef USE_PG
- if (scg_scsibus(scgp) == scglocal(scgp)->pgbus)
- return (pg_send(scgp));
+ if (usal_scsibus(usalp) == usallocal(usalp)->pgbus)
+ return (pg_send(usalp));
#endif
- if (sp->timeout != scgp->deftimeout)
+ if (sp->timeout != usalp->deftimeout)
sg_settimeout(f, sp->timeout);
sgp2 = sgp = &sg_rq;
- if (sp->addr == scglocal(scgp)->SCSIbuf) {
+ if (sp->addr == usallocal(usalp)->SCSIbuf) {
sgp = (struct sg_rq *)
- (scglocal(scgp)->SCSIbuf - (sizeof (struct sg_header) + amt));
+ (usallocal(usalp)->SCSIbuf - (sizeof (struct sg_header) + amt));
sgp2 = (struct sg_rq *)
- (scglocal(scgp)->SCSIbuf - (sizeof (struct sg_header)));
+ (usallocal(usalp)->SCSIbuf - (sizeof (struct sg_header)));
} else {
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"DMA addr: 0x%8.8lX size: %d - using copy buffer\n",
(long)sp->addr, sp->size);
}
if (sp->size > (int)(sizeof (sg_rq.buf) - SCG_MAX_CMD)) {
- if (scglocal(scgp)->xbuf == NULL) {
- scglocal(scgp)->xbufsize = scgp->maxbuf;
- scglocal(scgp)->xbuf =
- malloc(scglocal(scgp)->xbufsize +
+ if (usallocal(usalp)->xbuf == NULL) {
+ usallocal(usalp)->xbufsize = usalp->maxbuf;
+ usallocal(usalp)->xbuf =
+ malloc(usallocal(usalp)->xbufsize +
SCG_MAX_CMD +
sizeof (struct sg_header));
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"Allocated DMA copy buffer, addr: 0x%8.8lX size: %ld\n",
- (long)scglocal(scgp)->xbuf,
- scgp->maxbuf);
+ (long)usallocal(usalp)->xbuf,
+ usalp->maxbuf);
}
}
- if (scglocal(scgp)->xbuf == NULL ||
- sp->size > scglocal(scgp)->xbufsize) {
+ if (usallocal(usalp)->xbuf == NULL ||
+ sp->size > usallocal(usalp)->xbufsize) {
errno = ENOMEM;
return (-1);
}
- sgp2 = sgp = (struct sg_rq *)scglocal(scgp)->xbuf;
+ sgp2 = sgp = (struct sg_rq *)usallocal(usalp)->xbuf;
}
}
@@ -1451,7 +1451,7 @@
sg_rq.hd.pack_len = pack_len;
sg_rq.hd.reply_len = reply_len;
- sg_rq.hd.pack_id = scglocal(scgp)->pack_id++;
+ sg_rq.hd.pack_id = usallocal(usalp)->pack_id++;
/* sg_rq.hd.result = 0; not needed because of fillbytes() */
if ((caddr_t)&sg_rq != (caddr_t)sgp)
@@ -1461,7 +1461,7 @@
sgp->hd.pack_len = pack_len;
sgp->hd.reply_len = reply_len;
- sgp->hd.pack_id = scglocal(scgp)->pack_id++;
+ sgp->hd.pack_id = usallocal(usalp)->pack_id++;
/* sgp->hd.result = 0; not needed because of fillbytes() */
#endif
if (amt == 12)
@@ -1486,20 +1486,20 @@
#endif
i = sizeof (struct sg_header) + amt;
if ((amt = write(f, sgp, i)) < 0) { /* write */
- sg_settimeout(f, scgp->deftimeout);
+ sg_settimeout(f, usalp->deftimeout);
return (-1);
} else if (amt != i) {
- errmsg("scgo_send(%s) wrote %d bytes (expected %d).\n",
- scgp->cmdname, amt, i);
+ errmsg("usalo_send(%s) wrote %d bytes (expected %d).\n",
+ usalp->cmdname, amt, i);
}
- if (sp->addr == scglocal(scgp)->SCSIbuf) {
+ if (sp->addr == usallocal(usalp)->SCSIbuf) {
movebytes(sgp, sgp2, sizeof (struct sg_header));
sgp = sgp2;
}
sgp->hd.sense_buffer[0] = 0;
if ((amt = read(f, sgp, reply_len)) < 0) { /* read */
- sg_settimeout(f, scgp->deftimeout);
+ sg_settimeout(f, usalp->deftimeout);
return (-1);
}
@@ -1595,15 +1595,15 @@
to.tv_sec = sp->timeout;
to.tv_usec = 500000;
- __scg_times(scgp);
+ __usal_times(usalp);
- if (sp->timeout > 1 && scgp->cmdstop->tv_sec == 0) {
+ if (sp->timeout > 1 && usalp->cmdstop->tv_sec == 0) {
sp->u_scb.cmd_scb[0] = 0;
sp->ux_errno = EIO;
sp->error = SCG_FATAL; /* a selection timeout */
- } else if (scgp->cmdstop->tv_sec < to.tv_sec ||
- (scgp->cmdstop->tv_sec == to.tv_sec &&
- scgp->cmdstop->tv_usec < to.tv_usec)) {
+ } else if (usalp->cmdstop->tv_sec < to.tv_sec ||
+ (usalp->cmdstop->tv_sec == to.tv_sec &&
+ usalp->cmdstop->tv_usec < to.tv_usec)) {
sp->ux_errno = EIO;
sp->error = SCG_TIMEOUT; /* a timeout */
@@ -1626,9 +1626,9 @@
}
}
- if (scgp->verbose > 0 && scgp->debug > 0) {
+ if (usalp->verbose > 0 && usalp->debug > 0) {
#ifdef SG_GET_BUFSIZE
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"status: 0x%08X pack_len: %d, reply_len: %d pack_id: %d result: %d wn: %d gn: %d cdb_len: %d sense_len: %d sense[0]: %02X\n",
GETINT(sgp->hd.sg_cmd_status),
GETINT(sgp->hd.pack_len),
@@ -1641,7 +1641,7 @@
sgp->hd.sense_len,
sgp->hd.sense_buffer[0]);
#else
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"pack_len: %d, reply_len: %d pack_id: %d result: %d sense[0]: %02X\n",
GETINT(sgp->hd.pack_len),
GETINT(sgp->hd.reply_len),
@@ -1650,14 +1650,14 @@
sgp->hd.sense_buffer[0]);
#endif
#ifdef DEBUG
- js_fprintf((FILE *)scgp->errfile, "sense: ");
+ js_fprintf((FILE *)usalp->errfile, "sense: ");
for (i = 0; i < 16; i++)
- js_fprintf((FILE *)scgp->errfile, "%02X ", sgp->hd.sense_buffer[i]);
- js_fprintf((FILE *)scgp->errfile, "\n");
+ js_fprintf((FILE *)usalp->errfile, "%02X ", sgp->hd.sense_buffer[i]);
+ js_fprintf((FILE *)usalp->errfile, "\n");
#endif
}
- if (sp->timeout != scgp->deftimeout)
- sg_settimeout(f, scgp->deftimeout);
+ if (sp->timeout != usalp->deftimeout)
+ sg_settimeout(f, usalp->deftimeout);
return (0);
}
Modified: cdrkit/trunk/libusal/scsi-mac-iokit.c
===================================================================
--- cdrkit/trunk/libscg/scsi-mac-iokit.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-mac-iokit.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -26,7 +26,7 @@
* First version done by Constantine Sapuntzakis <csapuntz at Stanford.EDU>
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -50,12 +50,12 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-mac-iokit.c-1.10"; /* The version for this transport */
+static char _usal_trans_version[] = "scsi-mac-iokit.c-1.10"; /* The version for this transport */
#define MAX_SCG 16 /* Max # of SCSI controllers */
#define MAX_TGT 16
@@ -69,12 +69,12 @@
#include <IOKit/scsi-commands/SCSITaskLib.h>
#include <mach/mach_error.h>
-struct scg_local {
+struct usal_local {
MMCDeviceInterface **mmcDeviceInterface;
SCSITaskDeviceInterface **scsiTaskDeviceInterface;
mach_port_t masterPort;
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
#define MAX_DMA_NEXT (32*1024)
#if 0
@@ -87,19 +87,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -108,9 +108,9 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "SCSITaskDeviceInterface", "Apple SCSI",
+ __usal_help(f, "SCSITaskDeviceInterface", "Apple SCSI",
"", "Mac Prom device name", "IOCompactDiscServices/0",
FALSE, FALSE);
return (0);
@@ -128,7 +128,7 @@
* compact disc attached)
*/
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
mach_port_t masterPort = NULL;
io_iterator_t scsiObjectIterator = NULL;
@@ -145,7 +145,7 @@
int driveidx = 1, idx = 1;
if (device == NULL) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Please specify a device name (e.g. IOCompactDiscServices/0)");
goto out;
}
@@ -157,16 +157,16 @@
driveidx = atoi(tmp);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
goto out;
}
ioReturnValue = IOMasterPort(bootstrap_port, &masterPort);
if (ioReturnValue != kIOReturnSuccess) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Couldn't get a master IOKit port. Error %d",
ioReturnValue);
goto out;
@@ -174,7 +174,7 @@
dict = IOServiceMatching(realdevice);
if (dict == NULL) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Couldn't create dictionary for searching");
goto out;
}
@@ -185,7 +185,7 @@
if (scsiObjectIterator == NULL ||
(ioReturnValue != kIOReturnSuccess)) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"No matching device %s found.", device);
goto out;
}
@@ -203,7 +203,7 @@
}
if (scsiDevice == NULL) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"No matching device found. Iterator failed.");
goto out;
}
@@ -221,7 +221,7 @@
(LPVOID)&mmcDeviceInterface);
if (plugInResult != KERN_SUCCESS) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Unable to get MMC Interface: 0x%lX",
(long)plugInResult);
@@ -232,7 +232,7 @@
(*mmcDeviceInterface)->GetSCSITaskDeviceInterface(mmcDeviceInterface);
if (scsiTaskDeviceInterface == NULL) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Failed to get taskDeviceInterface");
goto out;
}
@@ -245,7 +245,7 @@
kIOCFPlugInInterfaceID,
&plugInInterface, &score);
if (ioReturnValue != kIOReturnSuccess) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Unable to get plugin Interface: %x",
ioReturnValue);
goto out;
@@ -256,7 +256,7 @@
(LPVOID)&scsiTaskDeviceInterface);
if (plugInResult != KERN_SUCCESS) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Unable to get generic Interface: 0x%lX",
(long)plugInResult);
@@ -268,7 +268,7 @@
(*scsiTaskDeviceInterface)->ObtainExclusiveAccess(scsiTaskDeviceInterface);
if (ioReturnValue != kIOReturnSuccess) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Unable to get exclusive access to device");
goto out;
}
@@ -277,10 +277,10 @@
(*mmcDeviceInterface)->AddRef(mmcDeviceInterface);
}
(*scsiTaskDeviceInterface)->AddRef(scsiTaskDeviceInterface);
- scglocal(scgp)->mmcDeviceInterface = mmcDeviceInterface;
- scglocal(scgp)->scsiTaskDeviceInterface = scsiTaskDeviceInterface;
- scglocal(scgp)->masterPort = masterPort;
- scg_settarget(scgp, 0, 0, 0);
+ usallocal(usalp)->mmcDeviceInterface = mmcDeviceInterface;
+ usallocal(usalp)->scsiTaskDeviceInterface = scsiTaskDeviceInterface;
+ usallocal(usalp)->masterPort = masterPort;
+ usal_settarget(usalp, 0, 0, 0);
err = 1;
out:
@@ -301,9 +301,9 @@
}
if (err < 0) {
- if (scgp->local) {
- free(scgp->local);
- scgp->local = NULL;
+ if (usalp->local) {
+ free(usalp->local);
+ usalp->local = NULL;
}
if (masterPort) {
@@ -322,42 +322,42 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
SCSITaskDeviceInterface **sc;
MMCDeviceInterface **mmc;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- sc = scglocal(scgp)->scsiTaskDeviceInterface;
+ sc = usallocal(usalp)->scsiTaskDeviceInterface;
(*sc)->ReleaseExclusiveAccess(sc);
(*sc)->Release(sc);
- scglocal(scgp)->scsiTaskDeviceInterface = NULL;
+ usallocal(usalp)->scsiTaskDeviceInterface = NULL;
- mmc = scglocal(scgp)->mmcDeviceInterface;
+ mmc = usallocal(usalp)->mmcDeviceInterface;
if (mmc != NULL)
(*mmc)->Release(mmc);
- mach_port_deallocate(mach_task_self(), scglocal(scgp)->masterPort);
+ mach_port_deallocate(mach_task_self(), usallocal(usalp)->masterPort);
- free(scgp->local);
- scgp->local = NULL;
+ free(usalp->local);
+ usalp->local = NULL;
return (0);
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
long maxdma = MAX_DMA_NEXT;
#ifdef SGIOCMAXDMA
int m;
- if (ioctl(scglocal(scgp)->scgfile, SGIOCMAXDMA, &m) >= 0) {
+ if (ioctl(usallocal(usalp)->usalfile, SGIOCMAXDMA, &m) >= 0) {
maxdma = m;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"maxdma: %d\n", maxdma);
}
}
@@ -366,26 +366,26 @@
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = malloc((size_t)(amt));
- return (scgp->bufbase);
+ usalp->bufbase = malloc((size_t)(amt));
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
if (busno == 0)
return (TRUE);
@@ -393,25 +393,25 @@
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
return (-1);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (FALSE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
if (what == SCG_RESET_NOP)
return (0);
@@ -425,9 +425,9 @@
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
SCSITaskDeviceInterface **sc = NULL;
SCSITaskInterface **cmd = NULL;
IOVirtualRange iov;
@@ -437,15 +437,15 @@
IOReturn ioReturnValue;
int ret = 0;
- if (scgp->local == NULL) {
+ if (usalp->local == NULL) {
return (-1);
}
- sc = scglocal(scgp)->scsiTaskDeviceInterface;
+ sc = usallocal(usalp)->scsiTaskDeviceInterface;
cmd = (*sc)->CreateSCSITask(sc);
if (cmd == NULL) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Failed to create SCSI task");
ret = -1;
@@ -462,7 +462,7 @@
sp->cdb.cmd_cdb, sp->cdb_len);
if (ioReturnValue != kIOReturnSuccess) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"SetCommandDescriptorBlock failed with status %x",
ioReturnValue);
ret = -1;
@@ -474,7 +474,7 @@
kSCSIDataTransfer_FromTargetToInitiator :
kSCSIDataTransfer_FromInitiatorToTarget);
if (ioReturnValue != kIOReturnSuccess) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"SetScatterGatherEntries failed with status %x",
ioReturnValue);
ret = -1;
@@ -483,7 +483,7 @@
ioReturnValue = (*cmd)->SetTimeoutDuration(cmd, sp->timeout * 1000);
if (ioReturnValue != kIOReturnSuccess) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"SetTimeoutDuration failed with status %x",
ioReturnValue);
ret = -1;
@@ -501,7 +501,7 @@
sp->ux_errno = geterrno();
if (ioReturnValue != kIOReturnSuccess) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Command execution failed with status %x",
ioReturnValue);
sp->error = SCG_RETRYABLE;
Modified: cdrkit/trunk/libusal/scsi-next.c
===================================================================
--- cdrkit/trunk/libscg/scsi-next.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-next.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -19,10 +19,10 @@
* Interface for the NeXT Step generic SCSI implementation.
*
* This is a hack, that tries to emulate the functionality
- * of the scg driver.
+ * of the usal driver.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -48,32 +48,32 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-next.c-1.32"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-next.c-1.32"; /* The version for this transport*/
#define MAX_SCG 16 /* Max # of SCSI controllers */
#define MAX_TGT 16
#define MAX_LUN 8
-struct scg_local {
- short scgfiles[MAX_SCG][MAX_TGT][MAX_LUN];
- int scgfile;
+struct usal_local {
+ short usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
+ int usalfile;
int max_scsibus;
int cur_scsibus;
int cur_target;
int cur_lun;
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
/*#define MAX_DMA_NEXT (32*1024)*/
#define MAX_DMA_NEXT (64*1024) /* Check if this is not too big */
-static BOOL scg_setup(SCSI *scgp, int busno, int tgt, int tlun, BOOL ex);
+static BOOL usal_setup(SCSI *usalp, int busno, int tgt, int tlun, BOOL ex);
/*
* Return version information for the low level SCSI transport code.
@@ -81,19 +81,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -102,27 +102,27 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "SGIOCREQ", "Generic SCSI",
+ __usal_help(f, "SGIOCREQ", "Generic SCSI",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
register int f;
register int i;
char devname[64];
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
@@ -130,127 +130,127 @@
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2)) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open by 'devname' not supported on this OS");
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
- scglocal(scgp)->scgfile = -1;
- scglocal(scgp)->max_scsibus = -1;
- scglocal(scgp)->cur_scsibus = -1;
- scglocal(scgp)->cur_target = -1;
- scglocal(scgp)->cur_lun = -1;
+ usallocal(usalp)->usalfile = -1;
+ usallocal(usalp)->max_scsibus = -1;
+ usallocal(usalp)->cur_scsibus = -1;
+ usallocal(usalp)->cur_target = -1;
+ usallocal(usalp)->cur_lun = -1;
}
for (i = 0; i < 4; i++) {
js_snprintf(devname, sizeof (devname), "/dev/sg%d", i);
f = open(devname, O_RDWR);
- if (scgp->debug > 0)
+ if (usalp->debug > 0)
errmsg("open(devname: '%s') : %d\n", devname, f);
if (f < 0)
continue;
- scglocal(scgp)->scgfile = f;
+ usallocal(usalp)->usalfile = f;
break;
}
if (f >= 0) {
- if (scglocal(scgp)->max_scsibus < 0) {
+ if (usallocal(usalp)->max_scsibus < 0) {
for (i = 0; i < MAX_SCG; i++) {
- if (!SCGO_HAVEBUS(scgp, i))
+ if (!SCGO_HAVEBUS(usalp, i))
break;
}
- scglocal(scgp)->max_scsibus = i;
+ usallocal(usalp)->max_scsibus = i;
}
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "maxbus: %d\n", scglocal(scgp)->max_scsibus);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "maxbus: %d\n", usallocal(usalp)->max_scsibus);
}
- if (scglocal(scgp)->max_scsibus <= 0) {
- scglocal(scgp)->max_scsibus = 1;
- scglocal(scgp)->cur_scsibus = 0;
+ if (usallocal(usalp)->max_scsibus <= 0) {
+ usallocal(usalp)->max_scsibus = 1;
+ usallocal(usalp)->cur_scsibus = 0;
}
ioctl(f, SGIOCENAS);
if (busno > 0 && tgt > 0 && tlun > 0)
- scg_setup(scgp, busno, tgt, tlun, TRUE);
+ usal_setup(usalp, busno, tgt, tlun, TRUE);
return (1);
}
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '/dev/sg*'");
return (0);
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- if (scglocal(scgp)->scgfile >= 0)
- close(scglocal(scgp)->scgfile);
- scglocal(scgp)->scgfile = -1;
+ if (usallocal(usalp)->usalfile >= 0)
+ close(usallocal(usalp)->usalfile);
+ usallocal(usalp)->usalfile = -1;
return (0);
}
static BOOL
-scg_setup(SCSI *scgp, int busno, int tgt, int tlun, BOOL ex)
+usal_setup(SCSI *usalp, int busno, int tgt, int tlun, BOOL ex)
{
scsi_adr_t sadr;
sadr.sa_target = tgt;
sadr.sa_lun = tlun;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scg_setup curbus %d -> %d\n", scglocal(scgp)->cur_scsibus, busno);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usal_setup curbus %d -> %d\n", usallocal(usalp)->cur_scsibus, busno);
}
- if (scgp->debug > 0 && ((scglocal(scgp)->cur_scsibus < 0 || scglocal(scgp)->cur_scsibus != busno)))
- js_fprintf((FILE *)scgp->errfile, "setting SCSI bus to: %d\n", busno);
- if ((scglocal(scgp)->cur_scsibus < 0 || scglocal(scgp)->cur_scsibus != busno) &&
- ioctl(scglocal(scgp)->scgfile, SGIOCCNTR, &busno) < 0) {
+ if (usalp->debug > 0 && ((usallocal(usalp)->cur_scsibus < 0 || usallocal(usalp)->cur_scsibus != busno)))
+ js_fprintf((FILE *)usalp->errfile, "setting SCSI bus to: %d\n", busno);
+ if ((usallocal(usalp)->cur_scsibus < 0 || usallocal(usalp)->cur_scsibus != busno) &&
+ ioctl(usallocal(usalp)->usalfile, SGIOCCNTR, &busno) < 0) {
- scglocal(scgp)->cur_scsibus = -1; /* Driver is in undefined state */
+ usallocal(usalp)->cur_scsibus = -1; /* Driver is in undefined state */
if (ex)
/* comerr("Cannot set SCSI bus\n");*/
errmsg("Cannot set SCSI bus\n");
return (FALSE);
}
- scglocal(scgp)->cur_scsibus = busno;
+ usallocal(usalp)->cur_scsibus = busno;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"setting target/lun to: %d/%d\n", tgt, tlun);
}
- if (ioctl(scglocal(scgp)->scgfile, SGIOCSTL, &sadr) < 0) {
+ if (ioctl(usallocal(usalp)->usalfile, SGIOCSTL, &sadr) < 0) {
if (ex)
comerr("Cannot set SCSI address\n");
return (FALSE);
}
- scglocal(scgp)->cur_scsibus = busno;
- scglocal(scgp)->cur_target = tgt;
- scglocal(scgp)->cur_lun = tlun;
+ usallocal(usalp)->cur_scsibus = busno;
+ usallocal(usalp)->cur_target = tgt;
+ usallocal(usalp)->cur_lun = tlun;
return (TRUE);
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
long maxdma = MAX_DMA_NEXT;
#ifdef SGIOCMAXDMA
int m;
- if (ioctl(scglocal(scgp)->scgfile, SGIOCMAXDMA, &m) >= 0) {
+ if (ioctl(usallocal(usalp)->usalfile, SGIOCMAXDMA, &m) >= 0) {
maxdma = m;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"maxdma: %d\n", maxdma);
}
}
@@ -268,73 +268,73 @@
#endif
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = valloc((size_t)(amt));
- return (scgp->bufbase);
+ usalp->bufbase = valloc((size_t)(amt));
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
- if (scglocal(scgp)->max_scsibus > 0 && busno >= scglocal(scgp)->max_scsibus)
+ if (usallocal(usalp)->max_scsibus > 0 && busno >= usallocal(usalp)->max_scsibus)
return (FALSE);
- return (scg_setup(scgp, busno, 0, 0, FALSE));
+ return (usal_setup(usalp, busno, 0, 0, FALSE));
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- if (scglocal(scgp)->max_scsibus > 0 && busno >= scglocal(scgp)->max_scsibus)
+ if (usallocal(usalp)->max_scsibus > 0 && busno >= usallocal(usalp)->max_scsibus)
return (-1);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- if ((busno != scglocal(scgp)->cur_scsibus) || (tgt != scglocal(scgp)->cur_target) || (tlun != scglocal(scgp)->cur_lun)) {
- if (!scg_setup(scgp, busno, tgt, tlun, FALSE))
+ if ((busno != usallocal(usalp)->cur_scsibus) || (tgt != usallocal(usalp)->cur_target) || (tlun != usallocal(usalp)->cur_lun)) {
+ if (!usal_setup(usalp, busno, tgt, tlun, FALSE))
return (-1);
}
- return (scglocal(scgp)->scgfile);
+ return (usallocal(usalp)->usalfile);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (FALSE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
if (what == SCG_RESET_NOP)
return (0);
@@ -342,19 +342,19 @@
errno = EINVAL;
return (-1);
}
- return (ioctl(scgp->fd, SGIOCRST, 0));
+ return (ioctl(usalp->fd, SGIOCRST, 0));
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
struct scsi_req req;
register long *lp1;
register long *lp2;
int ret = 0;
- if (scgp->fd < 0 || (sp->cdb_len > sizeof (req.sr_cdb))) {
+ if (usalp->fd < 0 || (sp->cdb_len > sizeof (req.sr_cdb))) {
sp->error = SCG_FATAL;
sp->ux_errno = EIO;
return (0);
@@ -369,7 +369,7 @@
req.sr_addr = sp->addr;
req.sr_dma_max = sp->size;
req.sr_ioto = sp->timeout;
- if (ioctl(scgp->fd, SGIOCREQ, (void *)&req) < 0) {
+ if (ioctl(usalp->fd, SGIOCREQ, (void *)&req) < 0) {
ret = -1;
sp->ux_errno = geterrno();
if (sp->ux_errno != ENOTTY)
@@ -377,13 +377,13 @@
} else {
sp->ux_errno = 0;
}
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile, "dma_dir: %X\n", req.sr_dma_dir);
- js_fprintf((FILE *)scgp->errfile, "dma_addr: %X\n", req.sr_addr);
- js_fprintf((FILE *)scgp->errfile, "io_time: %d\n", req.sr_ioto);
- js_fprintf((FILE *)scgp->errfile, "io_status: %d\n", req.sr_io_status);
- js_fprintf((FILE *)scgp->errfile, "scsi_status: %X\n", req.sr_scsi_status);
- js_fprintf((FILE *)scgp->errfile, "dma_xfer: %d\n", req.sr_dma_xfr);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile, "dma_dir: %X\n", req.sr_dma_dir);
+ js_fprintf((FILE *)usalp->errfile, "dma_addr: %X\n", req.sr_addr);
+ js_fprintf((FILE *)usalp->errfile, "io_time: %d\n", req.sr_ioto);
+ js_fprintf((FILE *)usalp->errfile, "io_status: %d\n", req.sr_io_status);
+ js_fprintf((FILE *)usalp->errfile, "scsi_status: %X\n", req.sr_scsi_status);
+ js_fprintf((FILE *)usalp->errfile, "dma_xfer: %d\n", req.sr_dma_xfr);
}
sp->u_scb.cmd_scb[0] = req.sr_scsi_status;
sp->sense_count = sizeof (esense_reply_t);
Modified: cdrkit/trunk/libusal/scsi-openserver.c
===================================================================
--- cdrkit/trunk/libscg/scsi-openserver.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-openserver.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -19,7 +19,7 @@
* Interface for the SCO SCSI implementation.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -47,12 +47,12 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-openserver.c-1.31"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-openserver.c-1.31"; /* The version for this transport*/
#define MAX_SCG 16 /* Max # of cdrom devices */
#define MAX_TGT 16 /* Not really needed */
@@ -66,7 +66,7 @@
#define MAXDRVN 10 /* max length of drivername */
#define DEV_DIR "/tmp"
-#define DEV_NAME "scg.s%1dt%1dl%1d"
+#define DEV_NAME "usal.s%1dt%1dl%1d"
/*
* ---------------------------------------------------------------------
@@ -145,7 +145,7 @@
*/
-typedef struct scg2sdi {
+typedef struct usal2sdi {
int valid;
int open;
@@ -153,31 +153,31 @@
int fd;
int lmscsi;
-} scg2sdi_t;
+} usal2sdi_t;
-static scg2sdi_t sdidevs [MAX_SCG][MAX_TGT][MAX_LUN];
+static usal2sdi_t sdidevs [MAX_SCG][MAX_TGT][MAX_LUN];
typedef struct amscsi {
char typ[MAXDRVN];
char drv[MAXDRVN];
int hba;
int bus;
- int scg;
+ int usal;
int tgt;
int lun;
char dev[MAXPATH];
} amscsi_t;
-struct scg_local {
- short scgfiles[MAX_SCG][MAX_TGT][MAX_LUN];
+struct usal_local {
+ short usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
static int sort_mscsi(const void *l1, const void *l2);
-static int openserver_init(SCSI *scgp);
-static void cp_scg2sco(struct scsicmd2 *sco, struct scg_cmd *scg);
-static void cp_sco2scg(struct scsicmd2 *sco, struct scg_cmd *scg);
+static int openserver_init(SCSI *usalp);
+static void cp_usal2sco(struct scsicmd2 *sco, struct usal_cmd *usal);
+static void cp_sco2usal(struct scsicmd2 *sco, struct usal_cmd *usal);
/*
* -------------------------------------------------------------------------
@@ -187,7 +187,7 @@
* to send scsi user comands to any target device controlled by the
* corresponding target driver.
*
- * This passthrough implementation for libscg currently allows to
+ * This passthrough implementation for libusal currently allows to
* handle the following devices classes:
*
* 1. DISK handled by Sdsk
@@ -195,7 +195,7 @@
* 3. TAPES handled by Stp
* 4. FLOPPY handled by Sflp
*
- * NOTE: The libscg OpenServer passthrough routines have changed with
+ * NOTE: The libusal OpenServer passthrough routines have changed with
* cdrecord-1.8 to enable the -scanbus option. Therefore the
* addressing scheme is now the same as used on many other platforms
* like Solaris, Linux etc.
@@ -212,19 +212,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -233,9 +233,9 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "SCSIUSERCMD/SCSIUSERCMD2", "Generic SCSI",
+ __usal_help(f, "SCSIUSERCMD/SCSIUSERCMD2", "Generic SCSI",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
return (0);
}
@@ -291,7 +291,7 @@
* currently configured into the kernel. This is done by reading
* the dynamic kernel mscsi tables and parse the resulting lines.
* As the output of 'sconf' is not directly usable the information
- * found is to be sorted and re-arranged to be used with the libscg
+ * found is to be sorted and re-arranged to be used with the libusal
* routines.
*
* NOTE: One problem is currently still not solved ! If you don't
@@ -305,10 +305,10 @@
*/
static int
-openserver_init(SCSI *scgp)
+openserver_init(SCSI *usalp)
{
FILE *cmd;
- int nscg = -1, lhba = -1, lbus = -1;
+ int nusal = -1, lhba = -1, lbus = -1;
int nSrom = -1, nSdsk = -1, nStp = -1, nSflp = -1;
int atapi, fd, nopen = 0;
int pos = 0, len = 0, nlm = 0;
@@ -372,8 +372,8 @@
evsave = environ;
environ = 0;
if ((cmd = popen(SCSI_CFG, "r")) == NULL) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Error popen() for \"%s\"",
SCSI_CFG);
environ = evsave;
@@ -383,23 +383,23 @@
if (fgets(lines, MAXLINE, cmd) == NULL) {
errno = EIO;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Error reading popen() for \"%s\"",
SCSI_CFG);
return (-1);
} else
nlm = atoi(lines);
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile, "-------------------- \n");
- js_fprintf((FILE *)scgp->errfile, "mscsi lines = %d\n", nlm);
- js_fprintf((FILE *)scgp->errfile, "-------------------- \n");
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile, "-------------------- \n");
+ js_fprintf((FILE *)usalp->errfile, "mscsi lines = %d\n", nlm);
+ js_fprintf((FILE *)usalp->errfile, "-------------------- \n");
}
if (pclose(cmd) == -1) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Error pclose() for \"%s\"",
SCSI_CFG);
return (-1);
@@ -413,7 +413,7 @@
cmtbl[l].bus = -1;
cmtbl[l].tgt = -1;
cmtbl[l].lun = -1;
- cmtbl[l].scg = -1;
+ cmtbl[l].usal = -1;
memset(cmtbl[l].typ, '\0', MAXDRVN);
memset(cmtbl[l].drv, '\0', MAXDRVN);
@@ -429,8 +429,8 @@
evsave = environ;
environ = 0;
if ((cmd = popen(sconf, "r")) == NULL) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Error popen() for \"%s\"",
sconf);
environ = evsave;
@@ -442,8 +442,8 @@
break;
if (pclose(cmd) == -1) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Error pclose() for \"%s\"",
sconf);
return (-1);
@@ -476,8 +476,8 @@
DEV_SFLP, ++nSflp);
}
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"%-4s = %5s(%d,%d,%d,%d) -> %s\n",
cmtbl[l].typ,
cmtbl[l].drv,
@@ -490,22 +490,22 @@
}
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile, "-------------------- \n");
- js_fprintf((FILE *)scgp->errfile, "%2d DISK \n", nSdsk + 1);
- js_fprintf((FILE *)scgp->errfile, "%2d CD-ROM\n", nSrom + 1);
- js_fprintf((FILE *)scgp->errfile, "%2d TAPE \n", nStp + 1);
- js_fprintf((FILE *)scgp->errfile, "%2d FLOPPY\n", nSflp + 1);
- js_fprintf((FILE *)scgp->errfile, "-------------------- \n");
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile, "-------------------- \n");
+ js_fprintf((FILE *)usalp->errfile, "%2d DISK \n", nSdsk + 1);
+ js_fprintf((FILE *)usalp->errfile, "%2d CD-ROM\n", nSrom + 1);
+ js_fprintf((FILE *)usalp->errfile, "%2d TAPE \n", nStp + 1);
+ js_fprintf((FILE *)usalp->errfile, "%2d FLOPPY\n", nSflp + 1);
+ js_fprintf((FILE *)usalp->errfile, "-------------------- \n");
}
/* ok, now let's sort this array of scsi devices */
qsort((void *) cmtbl, nlm, sizeof (amscsi_t), sort_mscsi);
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
for (l = 0; l < nlm; l++)
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"%-4s = %5s(%d,%d,%d,%d) -> %s\n",
cmtbl[l].typ,
cmtbl[l].drv,
@@ -514,10 +514,10 @@
cmtbl[l].tgt,
cmtbl[l].lun,
cmtbl[l].dev);
- js_fprintf((FILE *)scgp->errfile, "-------------------- \n");
+ js_fprintf((FILE *)usalp->errfile, "-------------------- \n");
}
- /* find root disk controller to make it scg 0 */
+ /* find root disk controller to make it usal 0 */
/*
* if we have disk(s) found in the mscsi table, we still
@@ -542,8 +542,8 @@
}
- if (!(ide_rootdisk) && (scgp->debug > 0)) {
- js_fprintf((FILE *)scgp->errfile,
+ if (!(ide_rootdisk) && (usalp->debug > 0)) {
+ js_fprintf((FILE *)usalp->errfile,
"root = %5s(%d,%d,%d,%d) -> %s\n",
cmtbl[t].drv,
cmtbl[t].hba,
@@ -551,10 +551,10 @@
cmtbl[t].tgt,
cmtbl[t].lun,
cmtbl[t].dev);
- js_fprintf((FILE *)scgp->errfile, "-------------------- \n");
+ js_fprintf((FILE *)usalp->errfile, "-------------------- \n");
}
- /* calculate scg from drv, hba and bus */
+ /* calculate usal from drv, hba and bus */
strcpy(drvid, "");
@@ -564,43 +564,43 @@
strcpy(drvid, cmtbl[s].drv);
lhba = cmtbl[s].hba;
lbus = cmtbl[s].bus;
- cmtbl[s].scg = ++nscg;
+ cmtbl[s].usal = ++nusal;
} else if (cmtbl[s].hba != lhba) {
lhba = cmtbl[s].hba;
lbus = cmtbl[s].bus;
- cmtbl[s].scg = ++nscg;
+ cmtbl[s].usal = ++nusal;
} else if (cmtbl[s].bus != lbus) {
lbus = cmtbl[s].bus;
- cmtbl[s].scg = ++nscg;
+ cmtbl[s].usal = ++nusal;
} else {
- cmtbl[s].scg = nscg;
+ cmtbl[s].usal = nusal;
}
- sdidevs[cmtbl[s].scg][cmtbl[s].tgt][cmtbl[s].lun].open = 0;
+ sdidevs[cmtbl[s].usal][cmtbl[s].tgt][cmtbl[s].lun].open = 0;
/* check whether we want to open all devices or it's a CDROM */
if ((scan_all) || (strcmp(cmtbl[s].typ, T_CDROM) == 0))
- sdidevs[cmtbl[s].scg][cmtbl[s].tgt][cmtbl[s].lun].valid = 1;
+ sdidevs[cmtbl[s].usal][cmtbl[s].tgt][cmtbl[s].lun].valid = 1;
/* check whether we have an IDE/ATAPI device */
if (strcmp(cmtbl[s].drv, DRV_ATAPI) == 0)
- sdidevs[cmtbl[s].scg][cmtbl[s].tgt][cmtbl[s].lun].atapi = 1;
+ sdidevs[cmtbl[s].usal][cmtbl[s].tgt][cmtbl[s].lun].atapi = 1;
/* don't open a USB device if enable_usb is not set */
if (strcmp(cmtbl[s].drv, DRV_USB) == 0)
- sdidevs[cmtbl[s].scg][cmtbl[s].tgt][cmtbl[s].lun].valid = enable_usb;
+ sdidevs[cmtbl[s].usal][cmtbl[s].tgt][cmtbl[s].lun].valid = enable_usb;
/* don't open a IDE/ATAPI device which is missing but configured */
if (strcmp(cmtbl[s].drv, DRV_NOHA) == 0)
- sdidevs[cmtbl[s].scg][cmtbl[s].tgt][cmtbl[s].lun].valid = 0;
+ sdidevs[cmtbl[s].usal][cmtbl[s].tgt][cmtbl[s].lun].valid = 0;
- sdidevs[cmtbl[s].scg][cmtbl[s].tgt][cmtbl[s].lun].lmscsi = s;
+ sdidevs[cmtbl[s].usal][cmtbl[s].tgt][cmtbl[s].lun].lmscsi = s;
}
@@ -628,8 +628,8 @@
errno = 0;
if ((fd = open(dname, (O_RDONLY | O_NONBLOCK))) < 0) {
sdidevs[s][t][l].valid = 0;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"%5s(%d,%d,%d,%d) -> %s open() failed: errno = %d (%s)\n",
cmtbl[mscsi].drv,
cmtbl[mscsi].hba,
@@ -643,8 +643,8 @@
continue;
}
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"%d,%d,%d => %5s(%d,%d,%d,%d) -> %d : %s \n",
s, t, l,
cmtbl[mscsi].drv,
@@ -652,22 +652,22 @@
cmtbl[mscsi].bus,
cmtbl[mscsi].tgt,
cmtbl[mscsi].lun,
- cmtbl[mscsi].scg,
+ cmtbl[mscsi].usal,
cmtbl[mscsi].dev);
}
sdidevs[s][t][l].fd = fd;
sdidevs[s][t][l].open = 1;
nopen++;
- scglocal(scgp)->scgfiles[s][t][l] = (short) fd;
+ usallocal(usalp)->usalfiles[s][t][l] = (short) fd;
}
}
}
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile, "-------------------- \n");
- js_fprintf((FILE *)scgp->errfile, "nopen = %d devices \n", nopen);
- js_fprintf((FILE *)scgp->errfile, "-------------------- \n");
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile, "-------------------- \n");
+ js_fprintf((FILE *)usalp->errfile, "nopen = %d devices \n", nopen);
+ js_fprintf((FILE *)usalp->errfile, "-------------------- \n");
}
return (nopen);
@@ -675,65 +675,65 @@
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
int f, b, t, l;
int nopen = 0;
char devname[64];
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
if (*device != '\0') { /* we don't allow old dev usage */
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open by 'devname' no longer supported on this OS");
return (-1);
}
- return (openserver_init(scgp));
+ return (openserver_init(usalp));
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
register int f;
register int b;
register int t;
register int l;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- f = scglocal(scgp)->scgfiles[b][t][l];
+ f = usallocal(usalp)->usalfiles[b][t][l];
if (f >= 0)
close(f);
@@ -741,7 +741,7 @@
sdidevs[b][t][l].open = 0;
sdidevs[b][t][l].valid = 0;
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -749,34 +749,34 @@
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
return (max_dma);
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = valloc((size_t)(amt));
+ usalp->bufbase = valloc((size_t)(amt));
- return (scgp->bufbase);
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
register int t;
register int l;
@@ -784,33 +784,33 @@
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- if (scglocal(scgp)->scgfiles[busno][t][l] >= 0)
+ if (usallocal(usalp)->usalfiles[busno][t][l] >= 0)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((int)scglocal(scgp)->scgfiles[busno][tgt][tlun]);
+ return ((int)usallocal(usalp)->usalfiles[busno][tgt][tlun]);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
@@ -829,70 +829,70 @@
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
- return (sdidevs[scg_scsibus(scgp)][scg_target(scgp)][scg_lun(scgp)].atapi);
+ return (sdidevs[usal_scsibus(usalp)][usal_target(usalp)][usal_lun(usalp)].atapi);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
errno = EINVAL;
return (-1); /* no scsi reset available */
}
static void
-cp_scg2sco(struct scsicmd2 *sco, struct scg_cmd *scg)
+cp_usal2sco(struct scsicmd2 *sco, struct usal_cmd *usal)
{
- sco->cmd.data_ptr = (char *) scg->addr;
- sco->cmd.data_len = scg->size;
- sco->cmd.cdb_len = scg->cdb_len;
+ sco->cmd.data_ptr = (char *) usal->addr;
+ sco->cmd.data_len = usal->size;
+ sco->cmd.cdb_len = usal->cdb_len;
- sco->sense_len = scg->sense_len;
- sco->sense_ptr = scg->u_sense.cmd_sense;
+ sco->sense_len = usal->sense_len;
+ sco->sense_ptr = usal->u_sense.cmd_sense;
- if (!(scg->flags & SCG_RECV_DATA) && (scg->size > 0))
+ if (!(usal->flags & SCG_RECV_DATA) && (usal->size > 0))
sco->cmd.is_write = 1;
- if (scg->cdb_len == SC_G0_CDBLEN)
- memcpy(sco->cmd.cdb, &scg->cdb.g0_cdb, scg->cdb_len);
+ if (usal->cdb_len == SC_G0_CDBLEN)
+ memcpy(sco->cmd.cdb, &usal->cdb.g0_cdb, usal->cdb_len);
- if (scg->cdb_len == SC_G1_CDBLEN)
- memcpy(sco->cmd.cdb, &scg->cdb.g1_cdb, scg->cdb_len);
+ if (usal->cdb_len == SC_G1_CDBLEN)
+ memcpy(sco->cmd.cdb, &usal->cdb.g1_cdb, usal->cdb_len);
- if (scg->cdb_len == SC_G5_CDBLEN)
- memcpy(sco->cmd.cdb, &scg->cdb.g5_cdb, scg->cdb_len);
+ if (usal->cdb_len == SC_G5_CDBLEN)
+ memcpy(sco->cmd.cdb, &usal->cdb.g5_cdb, usal->cdb_len);
}
static void
-cp_sco2scg(struct scsicmd2 *sco, struct scg_cmd *scg)
+cp_sco2usal(struct scsicmd2 *sco, struct usal_cmd *usal)
{
- scg->size = sco->cmd.data_len;
+ usal->size = sco->cmd.data_len;
- memset(&scg->scb, 0, sizeof (scg->scb));
+ memset(&usal->scb, 0, sizeof (usal->scb));
if (sco->sense_len > SCG_MAX_SENSE)
- scg->sense_count = SCG_MAX_SENSE;
+ usal->sense_count = SCG_MAX_SENSE;
else
- scg->sense_count = sco->sense_len;
+ usal->sense_count = sco->sense_len;
- scg->resid = 0;
+ usal->resid = 0;
- scg->u_scb.cmd_scb[0] = sco->cmd.target_sts;
+ usal->u_scb.cmd_scb[0] = sco->cmd.target_sts;
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
struct scsicmd2 scsi_cmd;
int i;
Uchar sense_buf[SCG_MAX_SENSE];
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
@@ -901,7 +901,7 @@
memset(sense_buf, 0, sizeof (sense_buf));
scsi_cmd.sense_ptr = sense_buf;
scsi_cmd.sense_len = sizeof (sense_buf);
- cp_scg2sco(&scsi_cmd, sp);
+ cp_usal2sco(&scsi_cmd, sp);
errno = 0;
sp->ux_errno = 0;
@@ -911,18 +911,18 @@
struct scsicmd s_cmd;
if (scsiusercmd) { /* Use SCSIUSERCMD ioctl() */
- if (scgp->debug > 1) {
- js_fprintf((FILE *)scgp->errfile, "calling SCSIUSERCMD ioctl()\n");
+ if (usalp->debug > 1) {
+ js_fprintf((FILE *)usalp->errfile, "calling SCSIUSERCMD ioctl()\n");
}
- if ((ioctlStatus = ioctl(scgp->fd, SCSIUSERCMD, &(scsi_cmd.cmd))) < 0) {
- if (scgp->debug > 1) {
- js_fprintf((FILE *)scgp->errfile, "returning from SCSIUSERCMD ioctl()\n");
+ if ((ioctlStatus = ioctl(usalp->fd, SCSIUSERCMD, &(scsi_cmd.cmd))) < 0) {
+ if (usalp->debug > 1) {
+ js_fprintf((FILE *)usalp->errfile, "returning from SCSIUSERCMD ioctl()\n");
}
if (errno == EINTR)
continue;
- cp_sco2scg(&scsi_cmd, sp);
+ cp_sco2usal(&scsi_cmd, sp);
sp->ux_errno = errno;
if (errno == 0)
sp->ux_errno = EIO;
@@ -931,10 +931,10 @@
return (0);
}
- if (scgp->debug > 1) {
- js_fprintf((FILE *)scgp->errfile, "returning from SCSIUSERCMD ioctl()\n");
+ if (usalp->debug > 1) {
+ js_fprintf((FILE *)usalp->errfile, "returning from SCSIUSERCMD ioctl()\n");
}
- cp_sco2scg(&scsi_cmd, sp);
+ cp_sco2usal(&scsi_cmd, sp);
sp->ux_errno = errno;
if (scsi_cmd.cmd.target_sts & 0x02) { /* Check Condition & get Sense */
@@ -949,7 +949,7 @@
s_cmd.is_write = 0;
s_cmd.cdb[0] = SC_REQUEST_SENSE;
- while (((ioctlStatus = ioctl(scgp->fd, SCSIUSERCMD, &s_cmd)) < 0) &&
+ while (((ioctlStatus = ioctl(usalp->fd, SCSIUSERCMD, &s_cmd)) < 0) &&
(errno == EINTR))
;
@@ -961,27 +961,27 @@
sp->error = SCG_NO_ERROR;
}
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
if (errno != 0)
- js_fprintf((FILE *)scgp->errfile, "ux_errno: %d (%s) \n", sp->ux_errno, strerror(sp->ux_errno));
+ js_fprintf((FILE *)usalp->errfile, "ux_errno: %d (%s) \n", sp->ux_errno, strerror(sp->ux_errno));
if (sp->u_scb.cmd_scb[0] != 0)
- js_fprintf((FILE *)scgp->errfile, "tgt_stat: %d \n", sp->u_scb.cmd_scb[0]);
+ js_fprintf((FILE *)usalp->errfile, "tgt_stat: %d \n", sp->u_scb.cmd_scb[0]);
}
break;
} else { /* Use SCSIUSERCMD2 ioctl() */
- if (scgp->debug > 1) {
- js_fprintf((FILE *)scgp->errfile, "calling SCSIUSERCMD2 ioctl()\n");
+ if (usalp->debug > 1) {
+ js_fprintf((FILE *)usalp->errfile, "calling SCSIUSERCMD2 ioctl()\n");
}
- if ((ioctlStatus = ioctl(scgp->fd, SCSIUSERCMD2, &scsi_cmd)) < 0) {
- if (scgp->debug > 1) {
- js_fprintf((FILE *)scgp->errfile, "returning from SCSIUSERCMD2 ioctl()\n");
+ if ((ioctlStatus = ioctl(usalp->fd, SCSIUSERCMD2, &scsi_cmd)) < 0) {
+ if (usalp->debug > 1) {
+ js_fprintf((FILE *)usalp->errfile, "returning from SCSIUSERCMD2 ioctl()\n");
}
if (errno == EINTR)
continue;
- cp_sco2scg(&scsi_cmd, sp);
+ cp_sco2usal(&scsi_cmd, sp);
sp->ux_errno = errno;
if (errno == 0)
sp->ux_errno = EIO;
@@ -989,11 +989,11 @@
return (0);
}
- if (scgp->debug > 1) {
- js_fprintf((FILE *)scgp->errfile, "returning from SCSIUSERCMD2 ioctl()\n");
+ if (usalp->debug > 1) {
+ js_fprintf((FILE *)usalp->errfile, "returning from SCSIUSERCMD2 ioctl()\n");
}
- cp_sco2scg(&scsi_cmd, sp);
+ cp_sco2usal(&scsi_cmd, sp);
sp->ux_errno = errno;
if (scsi_cmd.cmd.target_sts & 0x02) { /* Check Condition */
@@ -1002,11 +1002,11 @@
sp->error = SCG_NO_ERROR;
}
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
if (errno != 0)
- js_fprintf((FILE *)scgp->errfile, "ux_errno: %d (%s) \n", sp->ux_errno, strerror(sp->ux_errno));
+ js_fprintf((FILE *)usalp->errfile, "ux_errno: %d (%s) \n", sp->ux_errno, strerror(sp->ux_errno));
if (sp->u_scb.cmd_scb[0] != 0)
- js_fprintf((FILE *)scgp->errfile, "tgt_stat: %d \n", sp->u_scb.cmd_scb[0]);
+ js_fprintf((FILE *)usalp->errfile, "tgt_stat: %d \n", sp->u_scb.cmd_scb[0]);
}
break;
Modified: cdrkit/trunk/libusal/scsi-os2.c
===================================================================
--- cdrkit/trunk/libscg/scsi-os2.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-os2.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -21,7 +21,7 @@
* Get it from HOBBES or LEO.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -51,16 +51,16 @@
/*#define DEBUG*/
/* For AspiRouter */
-#include "scg/srb_os2.h"
+#include "usal/srb_os2.h"
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-os2.c-1.25"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-os2.c-1.25"; /* The version for this transport*/
#define FILE_OPEN 0x0001
#define OPEN_SHARE_DENYREADWRITE 0x0010
@@ -84,10 +84,10 @@
#define MAX_TGT 16
#define MAX_LUN 8
-struct scg_local {
+struct usal_local {
int dummy;
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
#define MAX_DMA_OS2 (63*1024) /* ASPI-Router allows up to 64k */
@@ -95,12 +95,12 @@
static HFILE driver_handle = 0;
static HEV postSema = 0;
-static BOOL open_driver(SCSI *scgp);
+static BOOL open_driver(SCSI *usalp);
static BOOL close_driver(void);
static ULONG wait_post(ULONG ulTimeOut);
static BOOL init_buffer(void* mem);
static void exit_func(void);
-static void set_error(SRB *srb, struct scg_cmd *sp);
+static void set_error(SRB *srb, struct usal_cmd *sp);
static void
@@ -116,19 +116,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -137,24 +137,24 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "ASPI", "Generic transport independent SCSI",
+ __usal_help(f, "ASPI", "Generic transport independent SCSI",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
@@ -162,19 +162,19 @@
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2)) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open by 'devname' not supported on this OS");
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
}
- if (!open_driver(scgp)) /* Try to open ASPI-Router */
+ if (!open_driver(usalp)) /* Try to open ASPI-Router */
return (-1);
atexit(exit_func); /* Install Exit Function which closes the ASPI-Router */
@@ -185,61 +185,61 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
exit_func();
return (0);
}
static long
-scgo_maxdma(SCSI *cgp, long amt)
+usalo_maxdma(SCSI *cgp, long amt)
{
long maxdma = MAX_DMA_OS2;
return (maxdma);
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
ULONG rc;
#ifdef DEBUG
- js_fprintf((FILE *)scgp->errfile, "scgo_getbuf: %ld bytes\n", amt);
+ js_fprintf((FILE *)usalp->errfile, "usalo_getbuf: %ld bytes\n", amt);
#endif
rc = DosAllocMem(&buffer, amt, OBJ_TILE | PAG_READ | PAG_WRITE | PAG_COMMIT);
if (rc) {
- js_fprintf((FILE *)scgp->errfile, "Cannot allocate buffer.\n");
+ js_fprintf((FILE *)usalp->errfile, "Cannot allocate buffer.\n");
return ((void *)0);
}
- scgp->bufbase = buffer;
+ usalp->bufbase = buffer;
#ifdef DEBUG
- js_fprintf((FILE *)scgp->errfile, "Buffer allocated at: 0x%x\n", scgp->bufbase);
+ js_fprintf((FILE *)usalp->errfile, "Buffer allocated at: 0x%x\n", usalp->bufbase);
#endif
/* Lock memory */
- if (init_buffer(scgp->bufbase))
- return (scgp->bufbase);
+ if (init_buffer(usalp->bufbase))
+ return (usalp->bufbase);
- js_fprintf((FILE *)scgp->errfile, "Cannot lock memory buffer.\n");
+ js_fprintf((FILE *)usalp->errfile, "Cannot lock memory buffer.\n");
return ((void *)0); /* Error */
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase && DosFreeMem(scgp->bufbase)) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->bufbase && DosFreeMem(usalp->bufbase)) {
+ js_fprintf((FILE *)usalp->errfile,
"Cannot free buffer memory for ASPI-Router!\n"); /* Free our memory buffer if not already done */
}
- if (buffer == scgp->bufbase)
+ if (buffer == usalp->bufbase)
buffer = NULL;
- scgp->bufbase = NULL;
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
register int t;
register int l;
@@ -251,7 +251,7 @@
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
@@ -266,20 +266,20 @@
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (FALSE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
ULONG rc; /* return value */
ULONG cbreturn;
@@ -297,15 +297,15 @@
* XXX Does this reset TGT or BUS ???
*/
SRBlock.cmd = SRB_Reset; /* reset device */
- SRBlock.ha_num = scg_scsibus(scgp); /* host adapter number */
+ SRBlock.ha_num = usal_scsibus(usalp); /* host adapter number */
SRBlock.flags = SRB_Post; /* posting enabled */
- SRBlock.u.res.target = scg_target(scgp); /* target id */
- SRBlock.u.res.lun = scg_lun(scgp); /* target LUN */
+ SRBlock.u.res.target = usal_target(usalp); /* target id */
+ SRBlock.u.res.lun = usal_lun(usalp); /* target LUN */
rc = DosDevIOCtl(driver_handle, 0x92, 0x02, (void*) &SRBlock, sizeof (SRB), &cbParam,
(void*) &SRBlock, sizeof (SRB), &cbreturn);
if (rc) {
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"DosDevIOCtl() failed in resetDevice.\n");
return (1); /* DosDevIOCtl failed */
} else {
@@ -316,9 +316,9 @@
if (SRBlock.status != SRB_Done)
return (3);
#ifdef DEBUG
- js_fprintf((FILE *)scgp->errfile,
- "resetDevice of host: %d target: %d lun: %d successful.\n", scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
+ "resetDevice of host: %d target: %d lun: %d successful.\n", usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
+ js_fprintf((FILE *)usalp->errfile,
"SRBlock.ha_status: 0x%x, SRBlock.target_status: 0x%x, SRBlock.satus: 0x%x\n",
SRBlock.u.cmd.ha_status, SRBlock.u.cmd.target_status, SRBlock.status);
#endif
@@ -329,7 +329,7 @@
* Set error flags
*/
static void
-set_error(SRB *srb, struct scg_cmd *sp)
+set_error(SRB *srb, struct usal_cmd *sp)
{
switch (srb->status) {
@@ -354,16 +354,16 @@
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
ULONG rc; /* return value */
static SRB SRBlock; /* XXX makes it non reentrant */
Ulong cbreturn;
Ulong cbParam;
UCHAR* ptr;
- if (scgp->fd < 0) { /* Set in scgo_open() */
+ if (usalp->fd < 0) { /* Set in usalo_open() */
sp->error = SCG_FATAL;
return (0);
}
@@ -371,8 +371,8 @@
if (sp->cdb_len > sizeof (SRBlock.u.cmd.cdb_st)) { /* commandsize too big */
sp->error = SCG_FATAL;
sp->ux_errno = EINVAL;
- js_fprintf((FILE *)scgp->errfile,
- "sp->cdb_len > SRBlock.u.cmd.cdb_st. Fatal error in scgo_send, exiting...\n");
+ js_fprintf((FILE *)usalp->errfile,
+ "sp->cdb_len > SRBlock.u.cmd.cdb_st. Fatal error in usalo_send, exiting...\n");
return (-1);
}
@@ -383,12 +383,12 @@
/* Build SRB command block */
SRBlock.cmd = SRB_Command;
- SRBlock.ha_num = scg_scsibus(scgp); /* host adapter number */
+ SRBlock.ha_num = usal_scsibus(usalp); /* host adapter number */
SRBlock.flags = SRB_Post; /* flags */
- SRBlock.u.cmd.target = scg_target(scgp); /* Target SCSI ID */
- SRBlock.u.cmd.lun = scg_lun(scgp); /* Target SCSI LUN */
+ SRBlock.u.cmd.target = usal_target(usalp); /* Target SCSI ID */
+ SRBlock.u.cmd.lun = usal_lun(usalp); /* Target SCSI LUN */
SRBlock.u.cmd.data_len = sp->size; /* # of bytes transferred */
SRBlock.u.cmd.data_ptr = 0; /* pointer to data buffer */
SRBlock.u.cmd.sense_len = sp->sense_len; /* length of sense buffer */
@@ -402,8 +402,8 @@
} else {
if (sp->size > 0) {
SRBlock.flags |= SRB_Write;
- if (scgp->bufbase != sp->addr) { /* Copy only if data not in ASPI-Mem */
- movebytes(sp->addr, scgp->bufbase, sp->size);
+ if (usalp->bufbase != sp->addr) { /* Copy only if data not in ASPI-Mem */
+ movebytes(sp->addr, usalp->bufbase, sp->size);
}
} else {
SRBlock.flags |= SRB_NoTransfer;
@@ -420,7 +420,7 @@
(void*) &SRBlock, sizeof (SRB), &cbreturn);
if (rc) { /* An error occured */
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"DosDevIOCtl() in sendCommand failed.\n");
sp->error = SCG_FATAL;
sp->ux_errno = EIO; /* Später vielleicht errno einsetzen */
@@ -433,13 +433,13 @@
/* Timeout */
sp->error = SCG_TIMEOUT;
sp->ux_errno = EIO;
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"Timeout during SCSI-Command.\n");
return (1);
}
sp->error = SCG_FATAL;
sp->ux_errno = EIO;
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"Fatal Error during DosWaitEventSem().\n");
return (1);
}
@@ -447,15 +447,15 @@
/* The command is processed */
if (SRBlock.status == SRB_Done) { /* succesful completion */
#ifdef DEBUG
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"Command successful finished. SRBlock.status=0x%x\n\n", SRBlock.status);
#endif
sp->sense_count = 0;
sp->resid = 0;
if (sp->flags & SCG_RECV_DATA) { /* We read data */
if (sp->addr && sp->size) {
- if (scgp->bufbase != sp->addr) /* Copy only if data not in ASPI-Mem */
- movebytes(scgp->bufbase, sp->addr, SRBlock.u.cmd.data_len);
+ if (usalp->bufbase != sp->addr) /* Copy only if data not in ASPI-Mem */
+ movebytes(usalp->bufbase, sp->addr, SRBlock.u.cmd.data_len);
ptr = (UCHAR*)sp->addr;
sp->resid = sp->size - SRBlock.u.cmd.data_len; /*nicht übertragene bytes. Korrekt berechnet???*/
}
@@ -494,8 +494,8 @@
}
if (sp->flags & SCG_RECV_DATA) {
if (sp->addr && sp->size) {
- if (scgp->bufbase != sp->addr) /* Copy only if data not in ASPI-Mem */
- movebytes(scgp->bufbase, sp->addr, SRBlock.u.cmd.data_len);
+ if (usalp->bufbase != sp->addr) /* Copy only if data not in ASPI-Mem */
+ movebytes(usalp->bufbase, sp->addr, SRBlock.u.cmd.data_len);
}
}
#ifdef really
@@ -520,7 +520,7 @@
* *
***************************************************************************/
static BOOL
-open_driver(SCSI *scgp)
+open_driver(SCSI *usalp)
{
ULONG rc; /* return value */
ULONG ActionTaken; /* return value */
@@ -540,7 +540,7 @@
OPEN_SHARE_DENYREADWRITE | OPEN_ACCESS_READWRITE,
NULL);
if (rc) {
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"Cannot open ASPI-Router!\n");
return (FALSE); /* opening failed -> return false*/
@@ -550,7 +550,7 @@
if (DosCreateEventSem(NULL, &postSema, /* create event semaphore */
DC_SEM_SHARED, 0)) {
DosClose(driver_handle);
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"Cannot create event semaphore!\n");
return (FALSE);
Modified: cdrkit/trunk/libusal/scsi-osf.c
===================================================================
--- cdrkit/trunk/libscg/scsi-osf.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-osf.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -23,7 +23,7 @@
* Bruno Achauer <bruno at tk.uni-linz.ac.at>
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -52,24 +52,24 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-osf.c-1.26"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-osf.c-1.26"; /* The version for this transport*/
#define MAX_SCG 16 /* Max # of SCSI controllers */
#define MAX_TGT 16
#define MAX_LUN 8
-struct scg_local {
- int scgfile; /* Used for ioctl() */
- short scgfiles[MAX_SCG][MAX_TGT][MAX_LUN];
+struct usal_local {
+ int usalfile; /* Used for ioctl() */
+ short usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
-static BOOL scsi_checktgt(SCSI *scgp, int f, int busno, int tgt, int tlun);
+static BOOL scsi_checktgt(SCSI *usalp, int f, int busno, int tgt, int tlun);
/*
* I don't have any documentation about CAM
@@ -86,19 +86,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -107,27 +107,27 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "CAM", "Generic transport independent SCSI (Common Access Method)",
+ __usal_help(f, "CAM", "Generic transport independent SCSI (Common Access Method)",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
register int b;
register int t;
register int l;
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
@@ -135,32 +135,32 @@
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2)) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open by 'devname' not supported on this OS");
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
- scglocal(scgp)->scgfile = -1;
+ usallocal(usalp)->usalfile = -1;
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->scgfiles[b][t][l] = 0;
+ usallocal(usalp)->usalfiles[b][t][l] = 0;
}
}
}
- if (scglocal(scgp)->scgfile != -1) /* multiple opens ??? */
+ if (usallocal(usalp)->usalfile != -1) /* multiple opens ??? */
return (1); /* not yet ready .... */
- if ((scglocal(scgp)->scgfile = open("/dev/cam", O_RDWR, 0)) < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if ((usallocal(usalp)->usalfile = open("/dev/cam", O_RDWR, 0)) < 0) {
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '/dev/cam'");
return (-1);
}
@@ -168,7 +168,7 @@
if (busno >= 0 && tgt >= 0 && tlun >= 0) {
/* scsi_checktgt() ??? */
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->scgfiles[b][t][l] = 1;
+ usallocal(usalp)->usalfiles[b][t][l] = 1;
return (1);
}
/*
@@ -178,9 +178,9 @@
*/
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
- if (scsi_checktgt(scgp, scglocal(scgp)->scgfile, b, t, 0)) {
+ if (scsi_checktgt(usalp, usallocal(usalp)->usalfile, b, t, 0)) {
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->scgfiles[b][t][l] = 1;
+ usallocal(usalp)->usalfiles[b][t][l] = 1;
/*
* Found a target on this bus.
* Comment the 'break' for a complete scan.
@@ -193,14 +193,14 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- if (scglocal(scgp)->scgfile >= 0)
- close(scglocal(scgp)->scgfile);
- scglocal(scgp)->scgfile = -1;
+ if (usallocal(usalp)->usalfile >= 0)
+ close(usallocal(usalp)->usalfile);
+ usallocal(usalp)->usalfile = -1;
return (0);
}
@@ -210,18 +210,18 @@
* XXX Is this really needed? We should rather let the cmd fail later.
*/
static BOOL
-scsi_checktgt(SCSI *scgp, int f, int busno, int tgt, int tlun)
+scsi_checktgt(SCSI *usalp, int f, int busno, int tgt, int tlun)
{
- struct scg_cmd *sp = scgp->scmd;
- struct scg_cmd sc;
+ struct usal_cmd *sp = usalp->scmd;
+ struct usal_cmd sc;
int ret;
- int ofd = scgp->fd;
- int obus = scg_scsibus(scgp);
- int otgt = scg_target(scgp);
- int olun = scg_lun(scgp);
+ int ofd = usalp->fd;
+ int obus = usal_scsibus(usalp);
+ int otgt = usal_target(usalp);
+ int olun = usal_lun(usalp);
- scg_settarget(scgp, busno, tgt, tlun);
- scgp->fd = f;
+ usal_settarget(usalp, busno, tgt, tlun);
+ usalp->fd = f;
sc = *sp;
fillbytes((caddr_t)sp, sizeof (*sp), '\0');
@@ -231,11 +231,11 @@
sp->cdb_len = SC_G0_CDBLEN;
sp->sense_len = CCS_SENSE_LEN;
sp->cdb.g0_cdb.cmd = SC_TEST_UNIT_READY;
- sp->cdb.g0_cdb.lun = scg_lun(scgp);
+ sp->cdb.g0_cdb.lun = usal_lun(usalp);
- scgo_send(scgp);
- scg_settarget(scgp, obus, otgt, olun);
- scgp->fd = ofd;
+ usalo_send(usalp);
+ usal_settarget(usalp, obus, otgt, olun);
+ usalp->fd = ofd;
if (sp->error != SCG_FATAL)
return (TRUE);
@@ -246,7 +246,7 @@
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
long maxdma = MAX_DMA_OSF_CAM;
@@ -254,37 +254,37 @@
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = valloc((size_t)(amt));
- return (scgp->bufbase);
+ usalp->bufbase = valloc((size_t)(amt));
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
register int t;
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
- if (scglocal(scgp)->scgfiles[busno][t][0] != 0)
+ if (usallocal(usalp)->usalfiles[busno][t][0] != 0)
return (TRUE);
}
return (FALSE);
@@ -292,37 +292,37 @@
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((busno < 0 || busno >= MAX_SCG) ? -1 : scglocal(scgp)->scgfile);
+ return ((busno < 0 || busno >= MAX_SCG) ? -1 : usallocal(usalp)->usalfile);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (FALSE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
errno = EINVAL;
return (-1);
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
CCB_SCSIIO ccb;
UAGT_CAM_CCB ua;
unsigned char *cdb;
@@ -330,7 +330,7 @@
UAGT_CAM_CCB relua;
int i;
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
@@ -370,29 +370,29 @@
for (i = 0; i < sp->cdb_len; i++)
cdb[i] = sp->cdb.cmd_cdb[i];
- ccb.cam_ch.cam_path_id = scg_scsibus(scgp);
- ccb.cam_ch.cam_target_id = scg_target(scgp);
- ccb.cam_ch.cam_target_lun = scg_lun(scgp);
+ ccb.cam_ch.cam_path_id = usal_scsibus(usalp);
+ ccb.cam_ch.cam_target_id = usal_target(usalp);
+ ccb.cam_ch.cam_target_lun = usal_lun(usalp);
sp->sense_count = 0;
sp->ux_errno = 0;
sp->error = SCG_NO_ERROR;
- if (ioctl(scgp->fd, UAGT_CAM_IO, (caddr_t) &ua) < 0) {
+ if (ioctl(usalp->fd, UAGT_CAM_IO, (caddr_t) &ua) < 0) {
sp->ux_errno = geterrno();
sp->error = SCG_FATAL;
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
errmsg("ioctl(fd, UAGT_CAM_IO, dev=%d,%d,%d) failed.\n",
- scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
+ usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
}
return (0);
}
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
errmsgno(EX_BAD, "cam_status = 0x%.2X scsi_status = 0x%.2X dev=%d,%d,%d\n",
ccb.cam_ch.cam_status,
ccb.cam_scsi_status,
- scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
+ usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
fflush(stderr);
}
switch (ccb.cam_ch.cam_status & CAM_STATUS_MASK) {
@@ -433,16 +433,16 @@
relsim.cam_ch.cam_ccb_len = sizeof (CCB_SCSIIO);
relsim.cam_ch.cam_func_code = XPT_REL_SIMQ;
relsim.cam_ch.cam_flags = CAM_DIR_IN | CAM_DIS_CALLBACK;
- relsim.cam_ch.cam_path_id = scg_scsibus(scgp);
- relsim.cam_ch.cam_target_id = scg_target(scgp);
- relsim.cam_ch.cam_target_lun = scg_lun(scgp);
+ relsim.cam_ch.cam_path_id = usal_scsibus(usalp);
+ relsim.cam_ch.cam_target_id = usal_target(usalp);
+ relsim.cam_ch.cam_target_lun = usal_lun(usalp);
relua.uagt_ccb = (struct ccb_header *) & relsim; /* wrong cast */
relua.uagt_ccblen = sizeof (relsim);
relua.uagt_buffer = NULL;
relua.uagt_buflen = 0;
- if (ioctl(scgp->fd, UAGT_CAM_IO, (caddr_t) & relua) < 0)
+ if (ioctl(usalp->fd, UAGT_CAM_IO, (caddr_t) & relua) < 0)
errmsg("DEC CAM -> LMA\n");
}
return (0);
Modified: cdrkit/trunk/libusal/scsi-qnx.c
===================================================================
--- cdrkit/trunk/libscg/scsi-qnx.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-qnx.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -21,7 +21,7 @@
* Kevin Chiles <kchiles at qnx.com>
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -50,22 +50,22 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-qnx.c-1.3"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-qnx.c-1.3"; /* The version for this transport*/
#define MAX_SCG 16 /* Max # of SCSI controllers */
#define MAX_TGT 16
#define MAX_LUN 8
-struct scg_local {
+struct usal_local {
int fd;
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
#define QNX_CAM_MAX_DMA (32*1024)
#ifndef AUTO_SENSE_LEN
@@ -78,20 +78,20 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
return ("Initial Version adopted from OSF-1 by QNX-people");
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -100,62 +100,62 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "CAM", "Generic transport independent SCSI (Common Access Method)",
+ __usal_help(f, "CAM", "Generic transport independent SCSI (Common Access Method)",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
int fd;
if (device == NULL || *device == '\0') {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"'devname' must be specified on this OS");
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
- scglocal(scgp)->fd = -1;
+ usallocal(usalp)->fd = -1;
}
- if (scglocal(scgp)->fd != -1) /* multiple open? */
+ if (usallocal(usalp)->fd != -1) /* multiple open? */
return (1);
- if ((scglocal(scgp)->fd = open(device, O_RDONLY, 0)) < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if ((usallocal(usalp)->fd = open(device, O_RDONLY, 0)) < 0) {
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'", device);
return (-1);
}
- scg_settarget(scgp, 0, 0, 0);
+ usal_settarget(usalp, 0, 0, 0);
return (1);
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- if (scglocal(scgp)->fd >= 0)
- close(scglocal(scgp)->fd);
- scglocal(scgp)->fd = -1;
+ if (usallocal(usalp)->fd >= 0)
+ close(usallocal(usalp)->fd);
+ usallocal(usalp)->fd = -1;
return (0);
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
long maxdma = QNX_CAM_MAX_DMA;
@@ -163,12 +163,12 @@
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
void *addr;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile, "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile, "usalo_getbuf: %ld bytes\n", amt);
}
if ((addr = mmap(NULL, amt, PROT_READ | PROT_WRITE | PROT_NOCACHE,
@@ -176,70 +176,70 @@
return (NULL);
}
- scgp->bufbase = addr;
+ usalp->bufbase = addr;
return (addr);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- munmap(scgp->bufbase, QNX_CAM_MAX_DMA);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ munmap(usalp->bufbase, QNX_CAM_MAX_DMA);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
return (FALSE);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((busno < 0 || busno >= MAX_SCG) ? -1 : scglocal(scgp)->fd);
+ return ((busno < 0 || busno >= MAX_SCG) ? -1 : usallocal(usalp)->fd);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
cam_devinfo_t cinfo;
- if (devctl(scgp->fd, DCMD_CAM_DEVINFO, &cinfo, sizeof (cinfo), NULL) != EOK) {
+ if (devctl(usalp->fd, DCMD_CAM_DEVINFO, &cinfo, sizeof (cinfo), NULL) != EOK) {
return (TRUE); /* default to ATAPI */
}
return ((cinfo.flags & DEV_ATAPI) ? TRUE : FALSE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
errno = EINVAL;
return (-1);
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
int i;
- struct scg_cmd *sp;
+ struct usal_cmd *sp;
int icnt;
iov_t iov[3];
CAM_PASS_THRU cpt;
icnt = 1;
- sp = scgp->scmd;
- if (scgp->fd < 0) {
+ sp = usalp->scmd;
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
@@ -276,10 +276,10 @@
SETIOV(&iov[0], &cpt, sizeof (cpt));
SETIOV(&iov[1], sp->u_sense.cmd_sense, cpt.cam_sense_len);
SETIOV(&iov[2], sp->addr, sp->size);
- if (devctlv(scglocal(scgp)->fd, DCMD_CAM_PASS_THRU, icnt, icnt, iov, iov, NULL)) {
+ if (devctlv(usallocal(usalp)->fd, DCMD_CAM_PASS_THRU, icnt, icnt, iov, iov, NULL)) {
sp->ux_errno = geterrno();
sp->error = SCG_FATAL;
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
errmsg("cam_io failed\n");
}
return (0);
Modified: cdrkit/trunk/libusal/scsi-remote.c
===================================================================
--- cdrkit/trunk/libscg/scsi-remote.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-remote.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -20,7 +20,7 @@
* Remote SCSI user level command transport routines
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -79,8 +79,8 @@
#include <strdefs.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsitransp.h>
#if defined(SIGDEFER) || defined(SVR4)
#define signal sigset
@@ -109,52 +109,52 @@
/*extern BOOL debug;*/
LOCAL BOOL debug = 1;
-LOCAL char _scg_trans_version[] = "remote-1.18"; /* The version for remote SCSI */
-LOCAL char _scg_auth_cdrkit[] = "cdrkit-team"; /* The author for this module */
+LOCAL char _usal_trans_version[] = "remote-1.18"; /* The version for remote SCSI */
+LOCAL char _usal_auth_cdrkit[] = "cdrkit-team"; /* The author for this module */
-LOCAL int scgo_rsend __PR((SCSI *scgp));
-LOCAL char * scgo_rversion __PR((SCSI *scgp, int what));
-LOCAL int scgo_rhelp __PR((SCSI *scgp, FILE *f));
-LOCAL int scgo_ropen __PR((SCSI *scgp, char *device));
-LOCAL int scgo_rclose __PR((SCSI *scgp));
-LOCAL long scgo_rmaxdma __PR((SCSI *scgp, long amt));
-LOCAL void * scgo_rgetbuf __PR((SCSI *scgp, long amt));
-LOCAL void scgo_rfreebuf __PR((SCSI *scgp));
-LOCAL BOOL scgo_rhavebus __PR((SCSI *scgp, int busno));
-LOCAL int scgo_rfileno __PR((SCSI *scgp, int busno, int tgt, int tlun));
-LOCAL int scgo_rinitiator_id __PR((SCSI *scgp));
-LOCAL int scgo_risatapi __PR((SCSI *scgp));
-LOCAL int scgo_rreset __PR((SCSI *scgp, int what));
+LOCAL int usalo_rsend __PR((SCSI *usalp));
+LOCAL char * usalo_rversion __PR((SCSI *usalp, int what));
+LOCAL int usalo_rhelp __PR((SCSI *usalp, FILE *f));
+LOCAL int usalo_ropen __PR((SCSI *usalp, char *device));
+LOCAL int usalo_rclose __PR((SCSI *usalp));
+LOCAL long usalo_rmaxdma __PR((SCSI *usalp, long amt));
+LOCAL void * usalo_rgetbuf __PR((SCSI *usalp, long amt));
+LOCAL void usalo_rfreebuf __PR((SCSI *usalp));
+LOCAL BOOL usalo_rhavebus __PR((SCSI *usalp, int busno));
+LOCAL int usalo_rfileno __PR((SCSI *usalp, int busno, int tgt, int tlun));
+LOCAL int usalo_rinitiator_id __PR((SCSI *usalp));
+LOCAL int usalo_risatapi __PR((SCSI *usalp));
+LOCAL int usalo_rreset __PR((SCSI *usalp, int what));
/*
* XXX We should rethink the fd parameter now that we introduced
* XXX the rscsirchar() function and most access of remfd is done
- * XXX via scglocal(scgp)->remfd.
+ * XXX via usallocal(usalp)->remfd.
*/
LOCAL void rscsiabrt __PR((int sig));
-LOCAL int rscsigetconn __PR((SCSI *scgp, char *host));
-LOCAL char *rscsiversion __PR((SCSI *scgp, int fd, int what));
-LOCAL int rscsiopen __PR((SCSI *scgp, int fd, char *fname));
-LOCAL int rscsiclose __PR((SCSI *scgp, int fd));
-LOCAL int rscsimaxdma __PR((SCSI *scgp, int fd, long amt));
-LOCAL int rscsigetbuf __PR((SCSI *scgp, int fd, long amt));
-LOCAL int rscsifreebuf __PR((SCSI *scgp, int fd));
-LOCAL int rscsihavebus __PR((SCSI *scgp, int fd, int bus));
-LOCAL int rscsifileno __PR((SCSI *scgp, int fd, int busno, int tgt, int tlun));
-LOCAL int rscsiinitiator_id __PR((SCSI *scgp, int fd));
-LOCAL int rscsiisatapi __PR((SCSI *scgp, int fd));
-LOCAL int rscsireset __PR((SCSI *scgp, int fd, int what));
-LOCAL int rscsiscmd __PR((SCSI *scgp, int fd, struct scg_cmd *sp));
-LOCAL int rscsifillrbuf __PR((SCSI *scgp));
-LOCAL int rscsirchar __PR((SCSI *scgp, char *cp));
-LOCAL int rscsireadbuf __PR((SCSI *scgp, int fd, char *buf, int count));
-LOCAL void rscsivoidarg __PR((SCSI *scgp, int fd, int count));
-LOCAL int rscsicmd __PR((SCSI *scgp, int fd, char *name, char *cbuf));
-LOCAL void rscsisendcmd __PR((SCSI *scgp, int fd, char *name, char *cbuf));
-LOCAL int rscsigetline __PR((SCSI *scgp, int fd, char *line, int count));
-LOCAL int rscsireadnum __PR((SCSI *scgp, int fd));
-LOCAL int rscsigetstatus __PR((SCSI *scgp, int fd, char *name));
-LOCAL int rscsiaborted __PR((SCSI *scgp, int fd));
+LOCAL int rscsigetconn __PR((SCSI *usalp, char *host));
+LOCAL char *rscsiversion __PR((SCSI *usalp, int fd, int what));
+LOCAL int rscsiopen __PR((SCSI *usalp, int fd, char *fname));
+LOCAL int rscsiclose __PR((SCSI *usalp, int fd));
+LOCAL int rscsimaxdma __PR((SCSI *usalp, int fd, long amt));
+LOCAL int rscsigetbuf __PR((SCSI *usalp, int fd, long amt));
+LOCAL int rscsifreebuf __PR((SCSI *usalp, int fd));
+LOCAL int rscsihavebus __PR((SCSI *usalp, int fd, int bus));
+LOCAL int rscsifileno __PR((SCSI *usalp, int fd, int busno, int tgt, int tlun));
+LOCAL int rscsiinitiator_id __PR((SCSI *usalp, int fd));
+LOCAL int rscsiisatapi __PR((SCSI *usalp, int fd));
+LOCAL int rscsireset __PR((SCSI *usalp, int fd, int what));
+LOCAL int rscsiscmd __PR((SCSI *usalp, int fd, struct usal_cmd *sp));
+LOCAL int rscsifillrbuf __PR((SCSI *usalp));
+LOCAL int rscsirchar __PR((SCSI *usalp, char *cp));
+LOCAL int rscsireadbuf __PR((SCSI *usalp, int fd, char *buf, int count));
+LOCAL void rscsivoidarg __PR((SCSI *usalp, int fd, int count));
+LOCAL int rscsicmd __PR((SCSI *usalp, int fd, char *name, char *cbuf));
+LOCAL void rscsisendcmd __PR((SCSI *usalp, int fd, char *name, char *cbuf));
+LOCAL int rscsigetline __PR((SCSI *usalp, int fd, char *line, int count));
+LOCAL int rscsireadnum __PR((SCSI *usalp, int fd));
+LOCAL int rscsigetstatus __PR((SCSI *usalp, int fd, char *name));
+LOCAL int rscsiaborted __PR((SCSI *usalp, int fd));
#ifdef USE_RCMD_RSH
LOCAL int _rcmdrsh __PR((char **ahost, int inport,
const char *locuser,
@@ -170,7 +170,7 @@
#define READBUF_SIZE 128
-struct scg_local {
+struct usal_local {
int remfd;
char readbuf[READBUF_SIZE];
char *readbptr;
@@ -184,29 +184,29 @@
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
-scg_ops_t remote_ops = {
- scgo_rsend, /* "S" end */
- scgo_rversion, /* "V" ersion */
- scgo_rhelp, /* help */
- scgo_ropen, /* "O" pen */
- scgo_rclose, /* "C" lose */
- scgo_rmaxdma, /* "D" MA */
- scgo_rgetbuf, /* "M" alloc */
- scgo_rfreebuf, /* "F" free */
- scgo_rhavebus, /* "B" us */
- scgo_rfileno, /* "T" arget */
- scgo_rinitiator_id, /* "I" nitiator */
- scgo_risatapi, /* "A" tapi */
- scgo_rreset, /* "R" eset */
+usal_ops_t remote_ops = {
+ usalo_rsend, /* "S" end */
+ usalo_rversion, /* "V" ersion */
+ usalo_rhelp, /* help */
+ usalo_ropen, /* "O" pen */
+ usalo_rclose, /* "C" lose */
+ usalo_rmaxdma, /* "D" MA */
+ usalo_rgetbuf, /* "M" alloc */
+ usalo_rfreebuf, /* "F" free */
+ usalo_rhavebus, /* "B" us */
+ usalo_rfileno, /* "T" arget */
+ usalo_rinitiator_id, /* "I" nitiator */
+ usalo_risatapi, /* "A" tapi */
+ usalo_rreset, /* "R" eset */
};
/*
* Return our ops ptr.
*/
-scg_ops_t *
-scg_remote()
+usal_ops_t *
+usal_remote()
{
return (&remote_ops);
}
@@ -217,105 +217,105 @@
* in applications.
*/
LOCAL char *
-scgo_rversion(scgp, what)
- SCSI *scgp;
+usalo_rversion(usalp, what)
+ SCSI *usalp;
int what;
{
int f;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return ((char *)0);
- f = scglocal(scgp)->remfd;
- if (scgp != (SCSI *)0) {
+ f = usallocal(usalp)->remfd;
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
case SCG_RVERSION:
- if (scglocal(scgp)->v_version == NULL)
- scglocal(scgp)->v_version = rscsiversion(scgp, f, SCG_VERSION);
- return (scglocal(scgp)->v_version);
+ if (usallocal(usalp)->v_version == NULL)
+ usallocal(usalp)->v_version = rscsiversion(usalp, f, SCG_VERSION);
+ return (usallocal(usalp)->v_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_RAUTHOR:
- if (scglocal(scgp)->v_author == NULL)
- scglocal(scgp)->v_author = rscsiversion(scgp, f, SCG_AUTHOR);
- return (scglocal(scgp)->v_author);
+ if (usallocal(usalp)->v_author == NULL)
+ usallocal(usalp)->v_author = rscsiversion(usalp, f, SCG_AUTHOR);
+ return (usallocal(usalp)->v_author);
case SCG_RSCCS_ID:
- if (scglocal(scgp)->v_sccs_id == NULL)
- scglocal(scgp)->v_sccs_id = rscsiversion(scgp, f, SCG_SCCS_ID);
- return (scglocal(scgp)->v_sccs_id);
+ if (usallocal(usalp)->v_sccs_id == NULL)
+ usallocal(usalp)->v_sccs_id = rscsiversion(usalp, f, SCG_SCCS_ID);
+ return (usallocal(usalp)->v_sccs_id);
}
}
return ((char *)0);
}
LOCAL int
-scgo_rhelp(scgp, f)
- SCSI *scgp;
+usalo_rhelp(usalp, f)
+ SCSI *usalp;
FILE *f;
{
- __scg_help(f, "RSCSI", "Remote SCSI",
+ __usal_help(f, "RSCSI", "Remote SCSI",
"REMOTE:", "rscsi at host:bus,target,lun", "REMOTE:rscsi at host:1,2,0", TRUE, FALSE);
return (0);
}
LOCAL int
-scgo_ropen(scgp, device)
- SCSI *scgp;
+usalo_ropen(usalp, device)
+ SCSI *usalp;
char *device;
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
register int f;
register int nopen = 0;
char devname[128];
char *p;
- if (scgp->overbose)
+ if (usalp->overbose)
fprintf(stderr, "Warning: Using remote SCSI interface.\n");
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
- scglocal(scgp)->remfd = -1;
- scglocal(scgp)->readbptr = scglocal(scgp)->readbuf;
- scglocal(scgp)->readbcnt = 0;
- scglocal(scgp)->isopen = FALSE;
- scglocal(scgp)->rsize = 0;
- scglocal(scgp)->wsize = 0;
- scglocal(scgp)->v_version = NULL;
- scglocal(scgp)->v_author = NULL;
- scglocal(scgp)->v_sccs_id = NULL;
+ usallocal(usalp)->remfd = -1;
+ usallocal(usalp)->readbptr = usallocal(usalp)->readbuf;
+ usallocal(usalp)->readbcnt = 0;
+ usallocal(usalp)->isopen = FALSE;
+ usallocal(usalp)->rsize = 0;
+ usallocal(usalp)->wsize = 0;
+ usallocal(usalp)->v_version = NULL;
+ usallocal(usalp)->v_author = NULL;
+ usallocal(usalp)->v_sccs_id = NULL;
}
if (device == NULL || (strncmp(device, "REMOTE", 6) != 0) ||
(device = strchr(device, ':')) == NULL) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal remote device syntax");
return (-1);
}
@@ -328,189 +328,189 @@
if ((p = strchr(devname, ':')) != NULL)
*p++ = '\0';
- f = rscsigetconn(scgp, devname);
+ f = rscsigetconn(usalp, devname);
if (f < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot get connection to remote host");
return (-1);
}
- scglocal(scgp)->remfd = f;
- debug = scgp->debug;
- if (rscsiopen(scgp, f, p) >= 0) {
+ usallocal(usalp)->remfd = f;
+ debug = usalp->debug;
+ if (rscsiopen(usalp, f, p) >= 0) {
nopen++;
- scglocal(scgp)->isopen = TRUE;
+ usallocal(usalp)->isopen = TRUE;
}
return (nopen);
}
LOCAL int
-scgo_rclose(scgp)
- SCSI *scgp;
+usalo_rclose(usalp)
+ SCSI *usalp;
{
register int f;
int ret;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- if (scglocal(scgp)->v_version != NULL) {
- free(scglocal(scgp)->v_version);
- scglocal(scgp)->v_version = NULL;
+ if (usallocal(usalp)->v_version != NULL) {
+ free(usallocal(usalp)->v_version);
+ usallocal(usalp)->v_version = NULL;
}
- if (scglocal(scgp)->v_author != NULL) {
- free(scglocal(scgp)->v_author);
- scglocal(scgp)->v_author = NULL;
+ if (usallocal(usalp)->v_author != NULL) {
+ free(usallocal(usalp)->v_author);
+ usallocal(usalp)->v_author = NULL;
}
- if (scglocal(scgp)->v_sccs_id != NULL) {
- free(scglocal(scgp)->v_sccs_id);
- scglocal(scgp)->v_sccs_id = NULL;
+ if (usallocal(usalp)->v_sccs_id != NULL) {
+ free(usallocal(usalp)->v_sccs_id);
+ usallocal(usalp)->v_sccs_id = NULL;
}
- f = scglocal(scgp)->remfd;
- if (f < 0 || !scglocal(scgp)->isopen)
+ f = usallocal(usalp)->remfd;
+ if (f < 0 || !usallocal(usalp)->isopen)
return (0);
- ret = rscsiclose(scgp, f);
- scglocal(scgp)->isopen = FALSE;
+ ret = rscsiclose(usalp, f);
+ usallocal(usalp)->isopen = FALSE;
close(f);
- scglocal(scgp)->remfd = -1;
+ usallocal(usalp)->remfd = -1;
return (ret);
}
LOCAL long
-scgo_rmaxdma(scgp, amt)
- SCSI *scgp;
+usalo_rmaxdma(usalp, amt)
+ SCSI *usalp;
long amt;
{
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1L);
- return (rscsimaxdma(scgp, scglocal(scgp)->remfd, amt));
+ return (rscsimaxdma(usalp, usallocal(usalp)->remfd, amt));
}
LOCAL void *
-scgo_rgetbuf(scgp, amt)
- SCSI *scgp;
+usalo_rgetbuf(usalp, amt)
+ SCSI *usalp;
long amt;
{
int ret;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return ((void *)0);
- ret = rscsigetbuf(scgp, scglocal(scgp)->remfd, amt);
+ ret = rscsigetbuf(usalp, usallocal(usalp)->remfd, amt);
if (ret < 0)
return ((void *)0);
#ifdef HAVE_VALLOC
- scgp->bufbase = (void *)valloc((size_t)amt);
+ usalp->bufbase = (void *)valloc((size_t)amt);
#else
- scgp->bufbase = (void *)malloc((size_t)amt);
+ usalp->bufbase = (void *)malloc((size_t)amt);
#endif
- if (scgp->bufbase == NULL) {
- scgo_rfreebuf(scgp);
+ if (usalp->bufbase == NULL) {
+ usalo_rfreebuf(usalp);
return ((void *)0);
}
- return (scgp->bufbase);
+ return (usalp->bufbase);
}
LOCAL void
-scgo_rfreebuf(scgp)
- SCSI *scgp;
+usalo_rfreebuf(usalp)
+ SCSI *usalp;
{
int f;
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return;
- f = scglocal(scgp)->remfd;
- if (f < 0 || !scglocal(scgp)->isopen)
+ f = usallocal(usalp)->remfd;
+ if (f < 0 || !usallocal(usalp)->isopen)
return;
- rscsifreebuf(scgp, f);
+ rscsifreebuf(usalp, f);
}
LOCAL BOOL
-scgo_rhavebus(scgp, busno)
- SCSI *scgp;
+usalo_rhavebus(usalp, busno)
+ SCSI *usalp;
int busno;
{
- if (scgp->local == NULL || busno < 0 || busno >= MAX_SCG)
+ if (usalp->local == NULL || busno < 0 || busno >= MAX_SCG)
return (FALSE);
- return (rscsihavebus(scgp, scglocal(scgp)->remfd, busno));
+ return (rscsihavebus(usalp, usallocal(usalp)->remfd, busno));
}
LOCAL int
-scgo_rfileno(scgp, busno, tgt, tlun)
- SCSI *scgp;
+usalo_rfileno(usalp, busno, tgt, tlun)
+ SCSI *usalp;
int busno;
int tgt;
int tlun;
{
int f;
- if (scgp->local == NULL ||
+ if (usalp->local == NULL ||
busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- f = scglocal(scgp)->remfd;
- if (f < 0 || !scglocal(scgp)->isopen)
+ f = usallocal(usalp)->remfd;
+ if (f < 0 || !usallocal(usalp)->isopen)
return (-1);
- return (rscsifileno(scgp, f, busno, tgt, tlun));
+ return (rscsifileno(usalp, f, busno, tgt, tlun));
}
LOCAL int
-scgo_rinitiator_id(scgp)
- SCSI *scgp;
+usalo_rinitiator_id(usalp)
+ SCSI *usalp;
{
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return (rscsiinitiator_id(scgp, scglocal(scgp)->remfd));
+ return (rscsiinitiator_id(usalp, usallocal(usalp)->remfd));
}
LOCAL int
-scgo_risatapi(scgp)
- SCSI *scgp;
+usalo_risatapi(usalp)
+ SCSI *usalp;
{
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return (rscsiisatapi(scgp, scglocal(scgp)->remfd));
+ return (rscsiisatapi(usalp, usallocal(usalp)->remfd));
}
LOCAL int
-scgo_rreset(scgp, what)
- SCSI *scgp;
+usalo_rreset(usalp, what)
+ SCSI *usalp;
int what;
{
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return (rscsireset(scgp, scglocal(scgp)->remfd, what));
+ return (rscsireset(usalp, usallocal(usalp)->remfd, what));
}
LOCAL int
-scgo_rsend(scgp)
- SCSI *scgp;
+usalo_rsend(usalp)
+ SCSI *usalp;
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
int ret;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
- ret = rscsiscmd(scgp, scglocal(scgp)->remfd, scgp->scmd);
+ ret = rscsiscmd(usalp, usallocal(usalp)->remfd, usalp->scmd);
return (ret);
}
@@ -524,8 +524,8 @@
}
LOCAL int
-rscsigetconn(scgp, host)
- SCSI *scgp;
+rscsigetconn(usalp, host)
+ SCSI *usalp;
char *host;
{
static struct servent *sp = 0;
@@ -563,7 +563,7 @@
} else {
name = pw->pw_name;
}
- if (scgp->debug > 0)
+ if (usalp->debug > 0)
errmsgno(EX_BAD, "locuser: '%s' rscsiuser: '%s' host: '%s'\n",
pw->pw_name, name, host);
rscsipeer = host;
@@ -590,8 +590,8 @@
}
LOCAL char *
-rscsiversion(scgp, fd, what)
- SCSI *scgp;
+rscsiversion(usalp, fd, what)
+ SCSI *usalp;
int fd;
int what;
{
@@ -600,17 +600,17 @@
int ret;
js_snprintf(cbuf, sizeof (cbuf), "V%d\n", what);
- ret = rscsicmd(scgp, fd, "version", cbuf);
+ ret = rscsicmd(usalp, fd, "version", cbuf);
p = malloc(ret);
if (p == NULL)
return (p);
- rscsireadbuf(scgp, fd, p, ret);
+ rscsireadbuf(usalp, fd, p, ret);
return (p);
}
LOCAL int
-rscsiopen(scgp, fd, fname)
- SCSI *scgp;
+rscsiopen(usalp, fd, fname)
+ SCSI *usalp;
int fd;
char *fname;
{
@@ -622,42 +622,42 @@
int lun;
js_snprintf(cbuf, sizeof (cbuf), "O%s\n", fname?fname:"");
- ret = rscsicmd(scgp, fd, "open", cbuf);
+ ret = rscsicmd(usalp, fd, "open", cbuf);
if (ret < 0)
return (ret);
- bus = rscsireadnum(scgp, fd);
- chan = rscsireadnum(scgp, fd);
- tgt = rscsireadnum(scgp, fd);
- lun = rscsireadnum(scgp, fd);
+ bus = rscsireadnum(usalp, fd);
+ chan = rscsireadnum(usalp, fd);
+ tgt = rscsireadnum(usalp, fd);
+ lun = rscsireadnum(usalp, fd);
- scg_settarget(scgp, bus, tgt, lun);
+ usal_settarget(usalp, bus, tgt, lun);
return (ret);
}
LOCAL int
-rscsiclose(scgp, fd)
- SCSI *scgp;
+rscsiclose(usalp, fd)
+ SCSI *usalp;
int fd;
{
- return (rscsicmd(scgp, fd, "close", "C\n"));
+ return (rscsicmd(usalp, fd, "close", "C\n"));
}
LOCAL int
-rscsimaxdma(scgp, fd, amt)
- SCSI *scgp;
+rscsimaxdma(usalp, fd, amt)
+ SCSI *usalp;
int fd;
long amt;
{
char cbuf[CMD_SIZE];
js_snprintf(cbuf, sizeof (cbuf), "D%ld\n", amt);
- return (rscsicmd(scgp, fd, "maxdma", cbuf));
+ return (rscsicmd(usalp, fd, "maxdma", cbuf));
}
LOCAL int
-rscsigetbuf(scgp, fd, amt)
- SCSI *scgp;
+rscsigetbuf(usalp, fd, amt)
+ SCSI *usalp;
int fd;
long amt;
{
@@ -666,33 +666,33 @@
int ret;
js_snprintf(cbuf, sizeof (cbuf), "M%ld\n", amt);
- ret = rscsicmd(scgp, fd, "getbuf", cbuf);
+ ret = rscsicmd(usalp, fd, "getbuf", cbuf);
if (ret < 0)
return (ret);
size = ret + 1024; /* Add protocol overhead */
#ifdef SO_SNDBUF
- if (size > scglocal(scgp)->wsize) while (size > 512 &&
+ if (size > usallocal(usalp)->wsize) while (size > 512 &&
setsockopt(fd, SOL_SOCKET, SO_SNDBUF,
(char *)&size, sizeof (size)) < 0) {
size -= 512;
}
- if (size > scglocal(scgp)->wsize) {
- scglocal(scgp)->wsize = size;
- if (scgp->debug > 0)
+ if (size > usallocal(usalp)->wsize) {
+ usallocal(usalp)->wsize = size;
+ if (usalp->debug > 0)
errmsgno(EX_BAD, "sndsize: %d\n", size);
}
#endif
#ifdef SO_RCVBUF
- if (size > scglocal(scgp)->rsize) while (size > 512 &&
+ if (size > usallocal(usalp)->rsize) while (size > 512 &&
setsockopt(fd, SOL_SOCKET, SO_RCVBUF,
(char *)&size, sizeof (size)) < 0) {
size -= 512;
}
- if (size > scglocal(scgp)->rsize) {
- scglocal(scgp)->rsize = size;
- if (scgp->debug > 0)
+ if (size > usallocal(usalp)->rsize) {
+ usallocal(usalp)->rsize = size;
+ if (usalp->debug > 0)
errmsgno(EX_BAD, "rcvsize: %d\n", size);
}
#endif
@@ -700,16 +700,16 @@
}
LOCAL int
-rscsifreebuf(scgp, fd)
- SCSI *scgp;
+rscsifreebuf(usalp, fd)
+ SCSI *usalp;
int fd;
{
- return (rscsicmd(scgp, fd, "freebuf", "F\n"));
+ return (rscsicmd(usalp, fd, "freebuf", "F\n"));
}
LOCAL int
-rscsihavebus(scgp, fd, busno)
- SCSI *scgp;
+rscsihavebus(usalp, fd, busno)
+ SCSI *usalp;
int fd;
int busno;
{
@@ -718,12 +718,12 @@
js_snprintf(cbuf, sizeof (cbuf), "B%d\n%d\n",
busno,
0);
- return (rscsicmd(scgp, fd, "havebus", cbuf));
+ return (rscsicmd(usalp, fd, "havebus", cbuf));
}
LOCAL int
-rscsifileno(scgp, fd, busno, tgt, tlun)
- SCSI *scgp;
+rscsifileno(usalp, fd, busno, tgt, tlun)
+ SCSI *usalp;
int fd;
int busno;
int tgt;
@@ -736,42 +736,42 @@
0,
tgt,
tlun);
- return (rscsicmd(scgp, fd, "fileno", cbuf));
+ return (rscsicmd(usalp, fd, "fileno", cbuf));
}
LOCAL int
-rscsiinitiator_id(scgp, fd)
- SCSI *scgp;
+rscsiinitiator_id(usalp, fd)
+ SCSI *usalp;
int fd;
{
- return (rscsicmd(scgp, fd, "initiator id", "I\n"));
+ return (rscsicmd(usalp, fd, "initiator id", "I\n"));
}
LOCAL int
-rscsiisatapi(scgp, fd)
- SCSI *scgp;
+rscsiisatapi(usalp, fd)
+ SCSI *usalp;
int fd;
{
- return (rscsicmd(scgp, fd, "isatapi", "A\n"));
+ return (rscsicmd(usalp, fd, "isatapi", "A\n"));
}
LOCAL int
-rscsireset(scgp, fd, what)
- SCSI *scgp;
+rscsireset(usalp, fd, what)
+ SCSI *usalp;
int fd;
int what;
{
char cbuf[CMD_SIZE];
js_snprintf(cbuf, sizeof (cbuf), "R%d\n", what);
- return (rscsicmd(scgp, fd, "reset", cbuf));
+ return (rscsicmd(usalp, fd, "reset", cbuf));
}
LOCAL int
-rscsiscmd(scgp, fd, sp)
- SCSI *scgp;
+rscsiscmd(usalp, fd, sp)
+ SCSI *usalp;
int fd;
- struct scg_cmd *sp;
+ struct usal_cmd *sp;
{
char cbuf[1600];
int ret;
@@ -795,66 +795,66 @@
}
errno = 0;
if (_nixwrite(fd, cbuf, ret) != ret)
- rscsiaborted(scgp, fd);
+ rscsiaborted(usalp, fd);
if (amt > 0) {
if (_nixwrite(fd, sp->addr, amt) != amt)
- rscsiaborted(scgp, fd);
+ rscsiaborted(usalp, fd);
}
- ret = rscsigetstatus(scgp, fd, "sendcmd");
+ ret = rscsigetstatus(usalp, fd, "sendcmd");
if (ret < 0)
return (ret);
sp->resid = sp->size - ret;
- sp->error = rscsireadnum(scgp, fd);
- sp->ux_errno = rscsireadnum(scgp, fd);
- *(Uchar *)&sp->scb = rscsireadnum(scgp, fd);
- sp->sense_count = rscsireadnum(scgp, fd);
+ sp->error = rscsireadnum(usalp, fd);
+ sp->ux_errno = rscsireadnum(usalp, fd);
+ *(Uchar *)&sp->scb = rscsireadnum(usalp, fd);
+ sp->sense_count = rscsireadnum(usalp, fd);
if (sp->sense_count > SCG_MAX_SENSE) {
voidsize = sp->sense_count - SCG_MAX_SENSE;
sp->sense_count = SCG_MAX_SENSE;
}
if (sp->sense_count > 0) {
- rscsireadbuf(scgp, fd, (char *)sp->u_sense.cmd_sense, sp->sense_count);
- rscsivoidarg(scgp, fd, voidsize);
+ rscsireadbuf(usalp, fd, (char *)sp->u_sense.cmd_sense, sp->sense_count);
+ rscsivoidarg(usalp, fd, voidsize);
}
if ((sp->flags & SCG_RECV_DATA) != 0 && ret > 0)
- rscsireadbuf(scgp, fd, sp->addr, ret);
+ rscsireadbuf(usalp, fd, sp->addr, ret);
return (0);
}
LOCAL int
-rscsifillrbuf(scgp)
- SCSI *scgp;
+rscsifillrbuf(usalp)
+ SCSI *usalp;
{
- scglocal(scgp)->readbptr = scglocal(scgp)->readbuf;
+ usallocal(usalp)->readbptr = usallocal(usalp)->readbuf;
- return (scglocal(scgp)->readbcnt =
- _niread(scglocal(scgp)->remfd,
- scglocal(scgp)->readbuf, READBUF_SIZE));
+ return (usallocal(usalp)->readbcnt =
+ _niread(usallocal(usalp)->remfd,
+ usallocal(usalp)->readbuf, READBUF_SIZE));
}
LOCAL int
-rscsirchar(scgp, cp)
- SCSI *scgp;
+rscsirchar(usalp, cp)
+ SCSI *usalp;
char *cp;
{
- if (--(scglocal(scgp)->readbcnt) < 0) {
- if (rscsifillrbuf(scgp) <= 0)
- return (scglocal(scgp)->readbcnt);
- --(scglocal(scgp)->readbcnt);
+ if (--(usallocal(usalp)->readbcnt) < 0) {
+ if (rscsifillrbuf(usalp) <= 0)
+ return (usallocal(usalp)->readbcnt);
+ --(usallocal(usalp)->readbcnt);
}
- *cp = *(scglocal(scgp)->readbptr)++;
+ *cp = *(usallocal(usalp)->readbptr)++;
return (1);
}
LOCAL int
-rscsireadbuf(scgp, fd, buf, count)
- SCSI *scgp;
+rscsireadbuf(usalp, fd, buf, count)
+ SCSI *usalp;
int fd;
char *buf;
int count;
@@ -863,18 +863,18 @@
register int amt = 0;
register int cnt;
- if (scglocal(scgp)->readbcnt > 0) {
- cnt = scglocal(scgp)->readbcnt;
+ if (usallocal(usalp)->readbcnt > 0) {
+ cnt = usallocal(usalp)->readbcnt;
if (cnt > n)
cnt = n;
- movebytes(scglocal(scgp)->readbptr, buf, cnt);
- scglocal(scgp)->readbptr += cnt;
- scglocal(scgp)->readbcnt -= cnt;
+ movebytes(usallocal(usalp)->readbptr, buf, cnt);
+ usallocal(usalp)->readbptr += cnt;
+ usallocal(usalp)->readbcnt -= cnt;
amt += cnt;
}
while (amt < n) {
if ((cnt = _niread(fd, &buf[amt], n - amt)) <= 0) {
- return (rscsiaborted(scgp, fd));
+ return (rscsiaborted(usalp, fd));
}
amt += cnt;
}
@@ -882,8 +882,8 @@
}
LOCAL void
-rscsivoidarg(scgp, fd, n)
- SCSI *scgp;
+rscsivoidarg(usalp, fd, n)
+ SCSI *usalp;
int fd;
register int n;
{
@@ -895,24 +895,24 @@
amt = sizeof (buf);
if ((n - i) < amt)
amt = n - i;
- rscsireadbuf(scgp, fd, buf, amt);
+ rscsireadbuf(usalp, fd, buf, amt);
}
}
LOCAL int
-rscsicmd(scgp, fd, name, cbuf)
- SCSI *scgp;
+rscsicmd(usalp, fd, name, cbuf)
+ SCSI *usalp;
int fd;
char *name;
char *cbuf;
{
- rscsisendcmd(scgp, fd, name, cbuf);
- return (rscsigetstatus(scgp, fd, name));
+ rscsisendcmd(usalp, fd, name, cbuf);
+ return (rscsigetstatus(usalp, fd, name));
}
LOCAL void
-rscsisendcmd(scgp, fd, name, cbuf)
- SCSI *scgp;
+rscsisendcmd(usalp, fd, name, cbuf)
+ SCSI *usalp;
int fd;
char *name;
char *cbuf;
@@ -921,12 +921,12 @@
errno = 0;
if (_nixwrite(fd, cbuf, buflen) != buflen)
- rscsiaborted(scgp, fd);
+ rscsiaborted(usalp, fd);
}
LOCAL int
-rscsigetline(scgp, fd, line, count)
- SCSI *scgp;
+rscsigetline(usalp, fd, line, count)
+ SCSI *usalp;
int fd;
char *line;
int count;
@@ -934,31 +934,31 @@
register char *cp;
for (cp = line; cp < &line[count]; cp++) {
- if (rscsirchar(scgp, cp) != 1)
- return (rscsiaborted(scgp, fd));
+ if (rscsirchar(usalp, cp) != 1)
+ return (rscsiaborted(usalp, fd));
if (*cp == '\n') {
*cp = '\0';
return (cp - line);
}
}
- return (rscsiaborted(scgp, fd));
+ return (rscsiaborted(usalp, fd));
}
LOCAL int
-rscsireadnum(scgp, fd)
- SCSI *scgp;
+rscsireadnum(usalp, fd)
+ SCSI *usalp;
int fd;
{
char cbuf[CMD_SIZE];
- rscsigetline(scgp, fd, cbuf, sizeof (cbuf));
+ rscsigetline(usalp, fd, cbuf, sizeof (cbuf));
return (atoi(cbuf));
}
LOCAL int
-rscsigetstatus(scgp, fd, name)
- SCSI *scgp;
+rscsigetstatus(usalp, fd, name)
+ SCSI *usalp;
int fd;
char *name;
{
@@ -968,29 +968,29 @@
int count;
int voidsize = 0;
- rscsigetline(scgp, fd, cbuf, sizeof (cbuf));
+ rscsigetline(usalp, fd, cbuf, sizeof (cbuf));
code = cbuf[0];
number = atoi(&cbuf[1]);
if (code == 'E' || code == 'F') {
- rscsigetline(scgp, fd, cbuf, sizeof (cbuf));
+ rscsigetline(usalp, fd, cbuf, sizeof (cbuf));
if (code == 'F') /* should close file ??? */
- rscsiaborted(scgp, fd);
+ rscsiaborted(usalp, fd);
- rscsigetline(scgp, fd, cbuf, sizeof (cbuf));
+ rscsigetline(usalp, fd, cbuf, sizeof (cbuf));
count = atoi(cbuf);
if (count > 0) {
- if (scgp->errstr == NULL) {
+ if (usalp->errstr == NULL) {
voidsize = count;
count = 0;
} else if (count > SCSI_ERRSTR_SIZE) {
voidsize = count - SCSI_ERRSTR_SIZE;
count = SCSI_ERRSTR_SIZE;
}
- rscsireadbuf(scgp, fd, scgp->errstr, count);
- rscsivoidarg(scgp, fd, voidsize);
+ rscsireadbuf(usalp, fd, usalp->errstr, count);
+ rscsivoidarg(usalp, fd, voidsize);
}
- if (scgp->debug > 0)
+ if (usalp->debug > 0)
errmsgno(number, "Remote status(%s): %d '%s'.\n",
name, number, cbuf);
errno = number;
@@ -998,19 +998,19 @@
}
if (code != 'A') {
/* XXX Hier kommt evt Command not found ... */
- if (scgp->debug > 0)
+ if (usalp->debug > 0)
errmsgno(EX_BAD, "Protocol error (got %s).\n", cbuf);
- return (rscsiaborted(scgp, fd));
+ return (rscsiaborted(usalp, fd));
}
return (number);
}
LOCAL int
-rscsiaborted(scgp, fd)
- SCSI *scgp;
+rscsiaborted(usalp, fd)
+ SCSI *usalp;
int fd;
{
- if ((scgp && scgp->debug > 0) || debug)
+ if ((usalp && usalp->debug > 0) || debug)
errmsgno(EX_BAD, "Lost connection to remote host ??\n");
/* if fd >= 0 */
/* close file */
Modified: cdrkit/trunk/libusal/scsi-sgi.c
===================================================================
--- cdrkit/trunk/libscg/scsi-sgi.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-sgi.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -22,10 +22,10 @@
* (needed libds, did not support bus scanning and had no error checking)
* from "Frank van Beek" <frank at neogeo.nl>
*
- * Actual implementation supports all scg features.
+ * Actual implementation supports all usal features.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -51,12 +51,12 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-sgi.c-1.36"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-sgi.c-1.36"; /* The version for this transport*/
#ifdef USE_DSLIB
@@ -69,10 +69,10 @@
#define MAX_TGT 16
#define MAX_LUN 8
-struct scg_local {
- short scgfiles[MAX_SCG][MAX_TGT][MAX_LUN];
+struct usal_local {
+ short usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
#endif
@@ -80,7 +80,7 @@
#ifndef USE_DSLIB
-static int scg_sendreq(SCSI *scgp, struct scg_cmd *sp, struct dsreq *dsp);
+static int usal_sendreq(SCSI *usalp, struct usal_cmd *sp, struct dsreq *dsp);
#endif
@@ -90,19 +90,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -111,19 +111,19 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "DS", "Generic SCSI",
+ __usal_help(f, "DS", "Generic SCSI",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
register int f;
register int b;
register int t;
@@ -133,8 +133,8 @@
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
@@ -142,21 +142,21 @@
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2)) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open by 'devname' not supported on this OS");
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -172,13 +172,13 @@
#else
f = open(devname, O_RDWR);
if (f < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'",
devname);
return (-1);
}
- scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
+ usallocal(usalp)->usalfiles[busno][tgt][tlun] = f;
#endif
return (1);
} else {
@@ -193,7 +193,7 @@
"/dev/scsi/sc%dd%dl%d", b, t, l);
f = open(devname, O_RDWR);
if (f >= 0) {
- scglocal(scgp)->scgfiles[b][t][l] = (short)f;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)f;
nopen++;
}
}
@@ -205,7 +205,7 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
#ifndef USE_DSLIB
register int f;
@@ -213,16 +213,16 @@
register int t;
register int l;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- f = scglocal(scgp)->scgfiles[b][t][l];
+ f = usallocal(usalp)->usalfiles[b][t][l];
if (f >= 0)
close(f);
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -233,32 +233,32 @@
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
return (MAX_DMA_SGI);
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = valloc((size_t)(amt));
- return (scgp->bufbase);
+ usalp->bufbase = valloc((size_t)(amt));
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
register int t;
register int l;
@@ -266,19 +266,19 @@
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- if (scglocal(scgp)->scgfiles[busno][t][l] >= 0)
+ if (usallocal(usalp)->usalfiles[busno][t][l] >= 0)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
#ifdef USE_DSLIB
if (dsp == NULL)
@@ -290,27 +290,27 @@
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((int)scglocal(scgp)->scgfiles[busno][tgt][tlun]);
+ return ((int)usallocal(usalp)->usalfiles[busno][tgt][tlun]);
#endif
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (FALSE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
/*
* Do we have a SCSI reset on SGI?
@@ -325,7 +325,7 @@
/*
* XXX Does this reset TGT or BUS ???
*/
- return (ioctl(scgp->fd, DS_RESET, 0));
+ return (ioctl(usalp->fd, DS_RESET, 0));
#else
return (-1);
#endif
@@ -333,7 +333,7 @@
#ifndef USE_DSLIB
static int
-scg_sendreq(SCSI *scgp, struct scg_cmd *sp, struct dsreq *dsp)
+usal_sendreq(SCSI *usalp, struct usal_cmd *sp, struct dsreq *dsp)
{
int ret;
int retries = 4;
@@ -343,7 +343,7 @@
/* retries = 0;*/
while (--retries > 0) {
- ret = ioctl(scgp->fd, DS_ENTER, dsp);
+ ret = ioctl(usalp->fd, DS_ENTER, dsp);
if (ret < 0) {
RET(dsp) = DSRT_DEVSCSI;
return (-1);
@@ -358,12 +358,12 @@
to.tv_sec = TIME(dsp)/1000;
to.tv_usec = TIME(dsp)%1000;
- __scg_times(scgp);
+ __usal_times(usalp);
if (sp->cdb.g0_cdb.cmd == SC_TEST_UNIT_READY &&
- scgp->cmdstop->tv_sec < to.tv_sec ||
- (scgp->cmdstop->tv_sec == to.tv_sec &&
- scgp->cmdstop->tv_usec < to.tv_usec)) {
+ usalp->cmdstop->tv_sec < to.tv_sec ||
+ (usalp->cmdstop->tv_sec == to.tv_sec &&
+ usalp->cmdstop->tv_usec < to.tv_usec)) {
RET(dsp) = DSRT_NOSEL;
return (-1);
@@ -392,9 +392,9 @@
#endif
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
int ret;
int i;
int amt = sp->cdb_len;
@@ -407,7 +407,7 @@
dsp->ds_iovlen = 0;
#endif
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
@@ -436,9 +436,9 @@
sp->sense_count = 0;
#ifdef USE_DSLIB
- ret = doscsireq(scgp->fd, dsp);
+ ret = doscsireq(usalp->fd, dsp);
#else
- ret = scg_sendreq(scgp, sp, dsp);
+ ret = usal_sendreq(usalp, sp, dsp);
#endif
if (RET(dsp) != DSRT_DEVSCSI)
Modified: cdrkit/trunk/libusal/scsi-sun.c
===================================================================
--- cdrkit/trunk/libscg/scsi-sun.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-sun.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -17,10 +17,10 @@
#endif
/*
* SCSI user level command transport routines for
- * the SCSI general driver 'scg'.
+ * the SCSI general driver 'usal'.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -42,7 +42,7 @@
* Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <scg/scgio.h>
+#include <usal/usalio.h>
#include <libport.h> /* Needed for gethostid() */
#ifdef HAVE_SUN_DKIO_H
@@ -71,47 +71,47 @@
# define USE_USCSI
#endif
-static char _scg_trans_version[] = "scg-1.83"; /* The version for /dev/scg */
-static char _scg_utrans_version[] = "uscsi-1.83"; /* The version for USCSI */
+static char _usal_trans_version[] = "usal-1.83"; /* The version for /dev/usal */
+static char _usal_utrans_version[] = "uscsi-1.83"; /* The version for USCSI */
#ifdef USE_USCSI
-static int scgo_uhelp(SCSI *scgp, FILE *f);
-static int scgo_uopen(SCSI *scgp, char *device);
-static int scgo_volopen(SCSI *scgp, char *devname);
-static int scgo_openmedia(SCSI *scgp, char *mname);
-static int scgo_uclose(SCSI *scgp);
-static int scgo_ucinfo(int f, struct dk_cinfo *cp, int debug);
-static int scgo_ugettlun(int f, int *tgtp, int *lunp);
-static long scgo_umaxdma(SCSI *scgp, long amt);
-static int scgo_openide(void);
-static BOOL scgo_uhavebus(SCSI *scgp, int);
-static int scgo_ufileno(SCSI *scgp, int, int, int);
-static int scgo_uinitiator_id(SCSI *scgp);
-static int scgo_uisatapi(SCSI *scgp);
-static int scgo_ureset(SCSI *scgp, int what);
-static int scgo_usend(SCSI *scgp);
+static int usalo_uhelp(SCSI *usalp, FILE *f);
+static int usalo_uopen(SCSI *usalp, char *device);
+static int usalo_volopen(SCSI *usalp, char *devname);
+static int usalo_openmedia(SCSI *usalp, char *mname);
+static int usalo_uclose(SCSI *usalp);
+static int usalo_ucinfo(int f, struct dk_cinfo *cp, int debug);
+static int usalo_ugettlun(int f, int *tgtp, int *lunp);
+static long usalo_umaxdma(SCSI *usalp, long amt);
+static int usalo_openide(void);
+static BOOL usalo_uhavebus(SCSI *usalp, int);
+static int usalo_ufileno(SCSI *usalp, int, int, int);
+static int usalo_uinitiator_id(SCSI *usalp);
+static int usalo_uisatapi(SCSI *usalp);
+static int usalo_ureset(SCSI *usalp, int what);
+static int usalo_usend(SCSI *usalp);
static int have_volmgt = -1;
-static scg_ops_t sun_uscsi_ops = {
- scgo_usend,
- scgo_version, /* Shared with SCG driver */
- scgo_uhelp,
- scgo_uopen,
- scgo_uclose,
- scgo_umaxdma,
- scgo_getbuf, /* Shared with SCG driver */
- scgo_freebuf, /* Shared with SCG driver */
- scgo_uhavebus,
- scgo_ufileno,
- scgo_uinitiator_id,
- scgo_uisatapi,
- scgo_ureset,
+static usal_ops_t sun_uscsi_ops = {
+ usalo_usend,
+ usalo_version, /* Shared with SCG driver */
+ usalo_uhelp,
+ usalo_uopen,
+ usalo_uclose,
+ usalo_umaxdma,
+ usalo_getbuf, /* Shared with SCG driver */
+ usalo_freebuf, /* Shared with SCG driver */
+ usalo_uhavebus,
+ usalo_ufileno,
+ usalo_uinitiator_id,
+ usalo_uisatapi,
+ usalo_ureset,
};
#endif
/*
- * Need to move this into an scg driver ioctl.
+ * Need to move this into an usal driver ioctl.
*/
/*#define MAX_DMA_SUN4M (1024*1024)*/
#define MAX_DMA_SUN4M (124*1024) /* Currently max working size */
@@ -133,23 +133,23 @@
#define ARCH_SUNX 0x80
/*
- * We are using a "real" /dev/scg?
+ * We are using a "real" /dev/usal?
*/
-#define scsi_xsend(scgp) ioctl((scgp)->fd, SCGIO_CMD, (scgp)->scmd)
+#define scsi_xsend(usalp) ioctl((usalp)->fd, SCGIO_CMD, (usalp)->scmd)
#define MAX_SCG 16 /* Max # of SCSI controllers */
#define MAX_TGT 16
#define MAX_LUN 8
-struct scg_local {
+struct usal_local {
union {
int SCG_files[MAX_SCG];
#ifdef USE_USCSI
- short scg_files[MAX_SCG][MAX_TGT][MAX_LUN];
+ short usal_files[MAX_SCG][MAX_TGT][MAX_LUN];
#endif
} u;
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
-#define scgfiles(p) (scglocal(p)->u.SCG_files)
+#define usallocal(p) ((struct usal_local *)((p)->local))
+#define usalfiles(p) (usallocal(p)->u.SCG_files)
/*
* Return version information for the low level SCSI transport code.
@@ -157,23 +157,23 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
#ifdef USE_USCSI
- if (scgp->ops == &sun_uscsi_ops)
- return (_scg_utrans_version);
+ if (usalp->ops == &sun_uscsi_ops)
+ return (_usal_utrans_version);
#endif
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -182,22 +182,22 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "scg", "Generic transport independent SCSI",
+ __usal_help(f, "usal", "Generic transport independent SCSI",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
#ifdef USE_USCSI
- scgo_uhelp(scgp, f);
+ usalo_uhelp(usalp, f);
#endif
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
-/* int tlun = scg_lun(scgp);*/
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+/* int tlun = usal_lun(usalp);*/
register int f;
register int i;
register int nopen = 0;
@@ -205,35 +205,35 @@
if (busno >= MAX_SCG) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno '%d'", busno);
return (-1);
}
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2)) {
#ifdef USE_USCSI
- scgp->ops = &sun_uscsi_ops;
- return (SCGO_OPEN(scgp, device));
+ usalp->ops = &sun_uscsi_ops;
+ return (SCGO_OPEN(usalp, device));
#else
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open by 'devname' not supported on this OS");
return (-1);
#endif
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE, "No memory for scg_local");
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL) {
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE, "No memory for usal_local");
return (0);
}
for (i = 0; i < MAX_SCG; i++) {
- scgfiles(scgp)[i] = -1;
+ usalfiles(usalp)[i] = -1;
}
}
@@ -244,51 +244,51 @@
*/
if (busno >= 0 && busno != i)
continue;
- js_snprintf(devname, sizeof (devname), "/dev/scg%d", i);
+ js_snprintf(devname, sizeof (devname), "/dev/usal%d", i);
f = open(devname, O_RDWR);
if (f < 0) {
if (errno != ENOENT && errno != ENXIO) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Cannot open '%s'", devname);
return (-1);
}
} else {
nopen++;
}
- scgfiles(scgp)[i] = f;
+ usalfiles(usalp)[i] = f;
}
#ifdef USE_USCSI
if (nopen <= 0) {
- if (scgp->local != NULL) {
- free(scgp->local);
- scgp->local = NULL;
+ if (usalp->local != NULL) {
+ free(usalp->local);
+ usalp->local = NULL;
}
- scgp->ops = &sun_uscsi_ops;
- return (SCGO_OPEN(scgp, device));
+ usalp->ops = &sun_uscsi_ops;
+ return (SCGO_OPEN(usalp, device));
}
#endif
return (nopen);
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
register int i;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
for (i = 0; i < MAX_SCG; i++) {
- if (scgfiles(scgp)[i] >= 0)
- close(scgfiles(scgp)[i]);
- scgfiles(scgp)[i] = -1;
+ if (usalfiles(usalp)[i] >= 0)
+ close(usalfiles(usalp)[i]);
+ usalfiles(usalp)[i] = -1;
}
return (0);
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
long maxdma = MAX_DMA_OTHER;
#if !defined(__i386_) && !defined(i386)
@@ -329,25 +329,25 @@
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
- return (busno < 0 || busno >= MAX_SCG) ? FALSE : (scgfiles(scgp)[busno] >= 0);
+ return (busno < 0 || busno >= MAX_SCG) ? FALSE : (usalfiles(usalp)[busno] >= 0);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((busno < 0 || busno >= MAX_SCG) ? -1 : scgfiles(scgp)[busno]);
+ return ((busno < 0 || busno >= MAX_SCG) ? -1 : usalfiles(usalp)[busno]);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
int id = -1;
#ifdef DKIO_GETCINFO
@@ -355,9 +355,9 @@
#endif
#ifdef DKIO_GETCINFO
- if (scgp->fd < 0)
+ if (usalp->fd < 0)
return (id);
- if (ioctl(scgp->fd, DKIO_GETCINFO, &conf) < 0)
+ if (ioctl(usalp->fd, DKIO_GETCINFO, &conf) < 0)
return (id);
if (TARGET(conf.dki_slave) != -1)
id = TARGET(conf.dki_slave);
@@ -366,13 +366,13 @@
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (FALSE);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
if (what == SCG_RESET_NOP)
return (0);
@@ -380,29 +380,29 @@
errno = EINVAL;
return (-1);
}
- return (ioctl(scgp->fd, SCGIORESET, 0));
+ return (ioctl(usalp->fd, SCGIORESET, 0));
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- scgp->bufbase = (void *)valloc((size_t)amt);
- return (scgp->bufbase);
+ usalp->bufbase = (void *)valloc((size_t)amt);
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- scgp->scmd->target = scg_target(scgp);
- return (ioctl(scgp->fd, SCGIO_CMD, scgp->scmd));
+ usalp->scmd->target = usal_target(usalp);
+ return (ioctl(usalp->fd, SCGIO_CMD, usalp->scmd));
}
/*--------------------------------------------------------------------------*/
@@ -439,19 +439,19 @@
#endif
static int
-scgo_uhelp(SCSI *scgp, FILE *f)
+usalo_uhelp(SCSI *usalp, FILE *f)
{
- __scg_help(f, "USCSI", "SCSI transport for targets known by Solaris drivers",
+ __usal_help(f, "USCSI", "SCSI transport for targets known by Solaris drivers",
"USCSI:", "bus,target,lun", "USCSI:1,2,0", TRUE, TRUE);
return (0);
}
static int
-scgo_uopen(SCSI *scgp, char *device)
+usalo_uopen(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
register int f;
register int b;
register int t;
@@ -462,8 +462,8 @@
if (have_volmgt < 0)
have_volmgt = volmgt_running();
- if (scgp->overbose) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->overbose) {
+ js_fprintf((FILE *)usalp->errfile,
"Warning: Using USCSI interface.\n");
}
#ifndef SEEK_HOLE
@@ -472,33 +472,33 @@
* medialess drives since Build 21. Using SEEK_HOLD as indicator
* seems to be the best guess.
*/
- if (scgp->overbose > 0 && have_volmgt) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->overbose > 0 && have_volmgt) {
+ js_fprintf((FILE *)usalp->errfile,
"Warning: Volume management is running, medialess managed drives are invisible.\n");
}
#endif
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr) {
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr) {
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
}
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE, "No memory for scg_local");
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL) {
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE, "No memory for usal_local");
return (0);
}
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->u.scg_files[b][t][l] = (short)-1;
+ usallocal(usalp)->u.usal_files[b][t][l] = (short)-1;
}
}
}
@@ -519,14 +519,14 @@
busno, tgt, tlun);
f = open(devname, O_RDONLY | O_NDELAY);
if (f < 0 && geterrno() == EBUSY)
- f = scgo_volopen(scgp, devname);
+ f = usalo_volopen(usalp, devname);
if (f < 0) {
- js_snprintf(scgp->errstr,
+ js_snprintf(usalp->errstr,
SCSI_ERRSTR_SIZE,
"Cannot open '%s'", devname);
return (0);
}
- scglocal(scgp)->u.scg_files[busno][tgt][tlun] = f;
+ usallocal(usalp)->u.usal_files[busno][tgt][tlun] = f;
return (1);
} else {
@@ -538,20 +538,20 @@
b, t, l);
f = open(devname, O_RDONLY | O_NDELAY);
if (f < 0 && geterrno() == EBUSY) {
- f = scgo_volopen(scgp, devname);
+ f = usalo_volopen(usalp, devname);
/*
* Hack to mark inaccessible
* drives with fd == -2
*/
if (f < 0 &&
- scglocal(scgp)->u.scg_files[b][t][l] < 0)
- scglocal(scgp)->u.scg_files[b][t][l] = f;
+ usallocal(usalp)->u.usal_files[b][t][l] < 0)
+ usallocal(usalp)->u.usal_files[b][t][l] = f;
}
if (f < 0 && errno != ENOENT &&
errno != ENXIO &&
errno != ENODEV) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr,
SCSI_ERRSTR_SIZE,
"Cannot open '%s'", devname);
}
@@ -559,8 +559,8 @@
break;
if (f >= 0) {
nopen ++;
- if (scglocal(scgp)->u.scg_files[b][t][l] == -1)
- scglocal(scgp)->u.scg_files[b][t][l] = f;
+ if (usallocal(usalp)->u.usal_files[b][t][l] == -1)
+ usallocal(usalp)->u.usal_files[b][t][l] = f;
else
close(f);
}
@@ -580,9 +580,9 @@
f = open(device, O_RDONLY | O_NDELAY);
if (f < 0)
- f = scgo_volopen(scgp, device);
+ f = usalo_volopen(usalp, device);
if (f < 0) {
- js_snprintf(scgp->errstr,
+ js_snprintf(usalp->errstr,
SCSI_ERRSTR_SIZE,
"Cannot open '%s'", device);
return (0);
@@ -591,7 +591,7 @@
if (busno < 0)
busno = 0; /* Use Fake number if not specified */
- if (scgo_ugettlun(f, &target, &lun) >= 0) {
+ if (usalo_ugettlun(f, &target, &lun) >= 0) {
if (tgt >= 0 && tlun >= 0) {
if (tgt != target || tlun != lun) {
close(f);
@@ -607,9 +607,9 @@
}
}
- if (scglocal(scgp)->u.scg_files[busno][tgt][tlun] == -1)
- scglocal(scgp)->u.scg_files[busno][tgt][tlun] = f;
- scg_settarget(scgp, busno, tgt, tlun);
+ if (usallocal(usalp)->u.usal_files[busno][tgt][tlun] == -1)
+ usallocal(usalp)->u.usal_files[busno][tgt][tlun] = f;
+ usal_settarget(usalp, busno, tgt, tlun);
return (++nopen);
}
@@ -617,7 +617,7 @@
}
static int
-scgo_volopen(SCSI *scgp, char *devname)
+usalo_volopen(SCSI *usalp, char *devname)
{
int oerr = geterrno();
int f = -1;
@@ -629,11 +629,11 @@
return (-1);
#ifdef VOLMGT_DEBUG
- scgp->debug++;
+ usalp->debug++;
#endif
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_volopen(%s)\n", devname);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_volopen(%s)\n", devname);
}
/*
@@ -644,8 +644,8 @@
symdev = volmgt_symdev(devname);
if (symdev)
name = volmgt_symname(symdev);
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"volmgt_symdev(%s)=%s -> %s\n", devname, symdev, name);
}
@@ -659,8 +659,8 @@
if (name)
symdev = volmgt_symdev(name);
}
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"volmgt_symdev(%s)=%s -> %s\n", devname, symdev, name);
}
@@ -671,20 +671,20 @@
*/
if (name)
mname = media_findname(name);
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"symdev %s name %s mname %s\n", symdev, name, mname);
}
/*
* Das scheint nur mit dem normierten /dev/rdsk/ *s2 Namen zu gehen.
*/
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"volmgt_inuse(%s) %d\n", symdev, volmgt_inuse(symdev));
}
if (mname)
- f = scgo_openmedia(scgp, mname);
+ f = usalo_openmedia(usalp, mname);
else if (name)
f = -2; /* Mark inaccessible drives with fd == -2 */
@@ -700,13 +700,13 @@
free(mname);
seterrno(oerr);
#ifdef VOLMGT_DEBUG
- scgp->debug--;
+ usalp->debug--;
#endif
return (f);
}
static int
-scgo_openmedia(SCSI *scgp, char *mname)
+usalo_openmedia(SCSI *usalp, char *mname)
{
int f = -1;
char *device = NULL;
@@ -756,23 +756,23 @@
}
static int
-scgo_uclose(SCSI *scgp)
+usalo_uclose(SCSI *usalp)
{
register int f;
register int b;
register int t;
register int l;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- f = scglocal(scgp)->u.scg_files[b][t][l];
+ f = usallocal(usalp)->u.usal_files[b][t][l];
if (f >= 0)
close(f);
- scglocal(scgp)->u.scg_files[b][t][l] = (short)-1;
+ usallocal(usalp)->u.usal_files[b][t][l] = (short)-1;
}
}
}
@@ -780,7 +780,7 @@
}
static int
-scgo_ucinfo(int f, struct dk_cinfo *cp, int debug)
+usalo_ucinfo(int f, struct dk_cinfo *cp, int debug)
{
fillbytes(cp, sizeof (*cp), '\0');
@@ -813,11 +813,11 @@
}
static int
-scgo_ugettlun(int f, int *tgtp, int *lunp)
+usalo_ugettlun(int f, int *tgtp, int *lunp)
{
struct dk_cinfo ci;
- if (scgo_ucinfo(f, &ci, 0) < 0)
+ if (usalo_ucinfo(f, &ci, 0) < 0)
return (-1);
if (tgtp)
*tgtp = TARGET(ci.dki_slave);
@@ -827,7 +827,7 @@
}
static long
-scgo_umaxdma(SCSI *scgp, long amt)
+usalo_umaxdma(SCSI *usalp, long amt)
{
register int b;
register int t;
@@ -837,15 +837,15 @@
struct dk_cinfo ci;
BOOL found_ide = FALSE;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1L);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- if ((f = scglocal(scgp)->u.scg_files[b][t][l]) < 0)
+ if ((f = usallocal(usalp)->u.usal_files[b][t][l]) < 0)
continue;
- if (scgo_ucinfo(f, &ci, scgp->debug) < 0)
+ if (usalo_ucinfo(f, &ci, usalp->debug) < 0)
continue;
if (maxdma < 0)
maxdma = (long)(ci.dki_maxtransfer * DEV_BSIZE);
@@ -868,12 +868,12 @@
* by retrieving the (correct) value from a ide hard disk.
*/
if (found_ide) {
- if ((f = scgo_openide()) >= 0) {
+ if ((f = usalo_openide()) >= 0) {
#ifdef sould_we
long omaxdma = maxdma;
#endif
- if (scgo_ucinfo(f, &ci, scgp->debug) >= 0) {
+ if (usalo_ucinfo(f, &ci, usalp->debug) >= 0) {
if (maxdma < 0)
maxdma = (long)(ci.dki_maxtransfer * DEV_BSIZE);
if (maxdma > (long)(ci.dki_maxtransfer * DEV_BSIZE))
@@ -901,14 +901,14 @@
* Use the knwoledge about default DMA sizes in this case.
*/
if (maxdma < 0)
- maxdma = scgo_maxdma(scgp, amt);
+ maxdma = usalo_maxdma(usalp, amt);
return (maxdma);
}
#if defined(__i386_) || defined(i386)
static int
-scgo_openide()
+usalo_openide()
{
char buf[20];
int b;
@@ -929,53 +929,53 @@
#endif
static BOOL
-scgo_uhavebus(SCSI *scgp, int busno)
+usalo_uhavebus(SCSI *usalp, int busno)
{
register int t;
register int l;
- if (scgp->local == NULL || busno < 0 || busno >= MAX_SCG)
+ if (usalp->local == NULL || busno < 0 || busno >= MAX_SCG)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- if (scglocal(scgp)->u.scg_files[busno][t][l] >= 0)
+ if (usallocal(usalp)->u.usal_files[busno][t][l] >= 0)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_ufileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_ufileno(SCSI *usalp, int busno, int tgt, int tlun)
{
- if (scgp->local == NULL ||
+ if (usalp->local == NULL ||
busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- return ((int)scglocal(scgp)->u.scg_files[busno][tgt][tlun]);
+ return ((int)usallocal(usalp)->u.usal_files[busno][tgt][tlun]);
}
static int
-scgo_uinitiator_id(SCSI *scgp)
+usalo_uinitiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_uisatapi(SCSI *scgp)
+usalo_uisatapi(SCSI *usalp)
{
char devname[32];
char symlinkname[MAXPATHLEN];
int len;
struct dk_cinfo ci;
- if (ioctl(scgp->fd, DKIOCINFO, &ci) < 0)
+ if (ioctl(usalp->fd, DKIOCINFO, &ci) < 0)
return (-1);
js_snprintf(devname, sizeof (devname), "/dev/rdsk/c%dt%dd%ds2",
- scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
+ usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
symlinkname[0] = '\0';
len = readlink(devname, symlinkname, sizeof (symlinkname));
@@ -989,7 +989,7 @@
}
static int
-scgo_ureset(SCSI *scgp, int what)
+usalo_ureset(SCSI *usalp, int what)
{
struct uscsi_cmd req;
@@ -1007,18 +1007,18 @@
return (-1);
}
- return (ioctl(scgp->fd, USCSICMD, &req));
+ return (ioctl(usalp->fd, USCSICMD, &req));
}
static int
-scgo_usend(SCSI *scgp)
+usalo_usend(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
struct uscsi_cmd req;
int ret;
static uid_t cureuid = 0; /* XXX Hack until we have uid management */
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
@@ -1044,7 +1044,7 @@
seteuid(0);
again:
errno = 0;
- ret = ioctl(scgp->fd, USCSICMD, &req);
+ ret = ioctl(usalp->fd, USCSICMD, &req);
if (ret < 0 && geterrno() == EPERM) { /* XXX Hack until we have uid management */
cureuid = geteuid();
@@ -1054,33 +1054,33 @@
if (cureuid != 0)
seteuid(cureuid);
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile, "ret: %d errno: %d (%s)\n", ret, errno, errmsgstr(errno));
- js_fprintf((FILE *)scgp->errfile, "uscsi_flags: 0x%x\n", req.uscsi_flags);
- js_fprintf((FILE *)scgp->errfile, "uscsi_status: 0x%x\n", req.uscsi_status);
- js_fprintf((FILE *)scgp->errfile, "uscsi_timeout: %d\n", req.uscsi_timeout);
- js_fprintf((FILE *)scgp->errfile, "uscsi_bufaddr: 0x%lx\n", (long)req.uscsi_bufaddr);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile, "ret: %d errno: %d (%s)\n", ret, errno, errmsgstr(errno));
+ js_fprintf((FILE *)usalp->errfile, "uscsi_flags: 0x%x\n", req.uscsi_flags);
+ js_fprintf((FILE *)usalp->errfile, "uscsi_status: 0x%x\n", req.uscsi_status);
+ js_fprintf((FILE *)usalp->errfile, "uscsi_timeout: %d\n", req.uscsi_timeout);
+ js_fprintf((FILE *)usalp->errfile, "uscsi_bufaddr: 0x%lx\n", (long)req.uscsi_bufaddr);
/*
* Cast auf int OK solange sp->size
* auch ein int bleibt.
*/
- js_fprintf((FILE *)scgp->errfile, "uscsi_buflen: %d\n", (int)req.uscsi_buflen);
- js_fprintf((FILE *)scgp->errfile, "uscsi_resid: %d\n", (int)req.uscsi_resid);
- js_fprintf((FILE *)scgp->errfile, "uscsi_rqlen: %d\n", req.uscsi_rqlen);
- js_fprintf((FILE *)scgp->errfile, "uscsi_rqstatus: 0x%x\n", req.uscsi_rqstatus);
- js_fprintf((FILE *)scgp->errfile, "uscsi_rqresid: %d\n", req.uscsi_rqresid);
- js_fprintf((FILE *)scgp->errfile, "uscsi_rqbuf ptr: 0x%lx\n", (long)req.uscsi_rqbuf);
- js_fprintf((FILE *)scgp->errfile, "uscsi_rqbuf: ");
+ js_fprintf((FILE *)usalp->errfile, "uscsi_buflen: %d\n", (int)req.uscsi_buflen);
+ js_fprintf((FILE *)usalp->errfile, "uscsi_resid: %d\n", (int)req.uscsi_resid);
+ js_fprintf((FILE *)usalp->errfile, "uscsi_rqlen: %d\n", req.uscsi_rqlen);
+ js_fprintf((FILE *)usalp->errfile, "uscsi_rqstatus: 0x%x\n", req.uscsi_rqstatus);
+ js_fprintf((FILE *)usalp->errfile, "uscsi_rqresid: %d\n", req.uscsi_rqresid);
+ js_fprintf((FILE *)usalp->errfile, "uscsi_rqbuf ptr: 0x%lx\n", (long)req.uscsi_rqbuf);
+ js_fprintf((FILE *)usalp->errfile, "uscsi_rqbuf: ");
if (req.uscsi_rqbuf != NULL && req.uscsi_rqlen > req.uscsi_rqresid) {
int i;
int len = req.uscsi_rqlen - req.uscsi_rqresid;
for (i = 0; i < len; i++) {
- js_fprintf((FILE *)scgp->errfile, "0x%02X ", ((char *)req.uscsi_rqbuf)[i]);
+ js_fprintf((FILE *)usalp->errfile, "0x%02X ", ((char *)req.uscsi_rqbuf)[i]);
}
- js_fprintf((FILE *)scgp->errfile, "\n");
+ js_fprintf((FILE *)usalp->errfile, "\n");
} else {
- js_fprintf((FILE *)scgp->errfile, "<data not available>\n");
+ js_fprintf((FILE *)usalp->errfile, "<data not available>\n");
}
}
if (ret < 0) {
@@ -1088,10 +1088,10 @@
/*
* Check if SCSI command cound not be send at all.
*/
- if (sp->ux_errno == ENOTTY && scgo_uisatapi(scgp) == TRUE) {
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "ENOTTY atapi: %d\n", scgo_uisatapi(scgp));
+ if (sp->ux_errno == ENOTTY && usalo_uisatapi(usalp) == TRUE) {
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "ENOTTY atapi: %d\n", usalo_uisatapi(usalp));
}
sp->error = SCG_FATAL;
return (0);
Modified: cdrkit/trunk/libusal/scsi-unixware.c
===================================================================
--- cdrkit/trunk/libscg/scsi-unixware.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-unixware.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -19,7 +19,7 @@
* Interface for the SCO UnixWare SCSI implementation.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -52,14 +52,14 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-unixware.c-1.36"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-unixware.c-1.36"; /* The version for this transport*/
-/* Max. number of scg scsibusses. The real limit would be */
+/* Max. number of usal scsibusses. The real limit would be */
/* MAX_HBA * MAX_BUS (which would be 32 * 8 on UnixWare 2.1/7.x), */
/* but given that we will hardly see such a beast, lets take 32 */
@@ -80,7 +80,7 @@
#define MAXPATH 256
#define DEV_DIR "/tmp"
-#define DEV_NAME "scg.s%1dt%1dl%1d"
+#define DEV_NAME "usal.s%1dt%1dl%1d"
#define SCAN_HBA "%d:%d,%d,%d:%7s : %n"
#define SCAN_DEV "%d,%d,%d:%7s : %n"
@@ -94,7 +94,7 @@
#define SDI_ATAPI 0x02 /* Connected via IDE HBA */
#define SDI_INITIATOR 0x04 /* This is the initiator target ID */
-typedef struct scg2sdi {
+typedef struct usal2sdi {
short open;
short flags;
short fd;
@@ -112,19 +112,19 @@
char vend[40];
char devn[32];
#endif
-} scg2sdi_t;
+} usal2sdi_t;
-static scg2sdi_t sdidevs [MAX_SCG][MAX_TGT][MAX_LUN];
+static usal2sdi_t sdidevs [MAX_SCG][MAX_TGT][MAX_LUN];
static BOOL sdiinit = FALSE;
-struct scg_local {
- short scgfiles[MAX_SCG][MAX_TGT][MAX_LUN];
+struct usal_local {
+ short usalfiles[MAX_SCG][MAX_TGT][MAX_LUN];
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
-static int unixware_init(SCSI *scgp);
-static int do_scg_cmd(SCSI *scgp, struct scg_cmd *sp);
-static int do_scg_sense(SCSI *scgp, struct scg_cmd *sp);
+static int unixware_init(SCSI *usalp);
+static int do_usal_cmd(SCSI *usalp, struct usal_cmd *sp);
+static int do_usal_sense(SCSI *usalp, struct usal_cmd *sp);
static FILE *xpopen(char *cmd, char *type);
static int xpclose(FILE *f);
@@ -133,7 +133,7 @@
* SCO UnixWare 2.1.x / UnixWare 7 provides a scsi pass-through mechanism,
* which can be used to access any configured scsi device.
*
- * NOTE: The libscg UnixWare passthrough routines have changed with
+ * NOTE: The libusal UnixWare passthrough routines have changed with
* cdrecord-1.8 to enable the -scanbus, -load, -eject option
* regardless of the status of media and the addressing
* scheme is now the same as used on many other platforms like
@@ -151,19 +151,19 @@
*
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -173,9 +173,9 @@
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "SDI_SEND", "Generic SCSI",
+ __usal_help(f, "SDI_SEND", "Generic SCSI",
"", "bus,target,lun", "1,2,0", TRUE, FALSE);
return (0);
}
@@ -190,11 +190,11 @@
*/
static int
-unixware_init(SCSI *scgp)
+unixware_init(SCSI *usalp)
{
FILE *cmd;
- int hba = 0, bus = 0, scg = 0, tgt = 0, lun = 0;
- int nscg = -1, lhba = -1, lbus = 0;
+ int hba = 0, bus = 0, usal = 0, tgt = 0, lun = 0;
+ int nusal = -1, lhba = -1, lbus = 0;
int atapi, fd, nopen = 0, pos = 0, len = 0;
int s, t, l;
int scan_disks;
@@ -211,16 +211,16 @@
/* Check for validity of primary hostbus adapter node */
if (stat(PRIM_HBA, &stbuf) < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Can not stat() primary hba (%s)",
PRIM_HBA);
return (-1);
}
if (!S_ISCHR(stbuf.st_mode)) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Primary hba (%s) not a character device",
PRIM_HBA);
return (-1);
@@ -242,8 +242,8 @@
evsave = environ;
environ = 0;
if ((cmd = xpopen(SCSI_CFG, "r")) == NULL) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Error popen() for \"%s\"",
SCSI_CFG);
environ = evsave;
@@ -264,7 +264,7 @@
hba = lhba;
} else {
sscanf(lines, SCAN_HBA, &hba, &bus, &tgt, &lun, class, &pos);
- nscg++;
+ nusal++;
lhba = hba;
atapi = 0;
}
@@ -277,17 +277,17 @@
strncpy(ident, &lines[pos], len);
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"SDI -> %d:%d,%d,%d: %-7s : %s\n",
hba, bus, tgt, lun, class, ident);
}
if (bus != lbus) {
- nscg++;
+ nusal++;
lbus = bus;
}
- scg = nscg;
+ usal = nusal;
/* check whether we have a HBA or a SCSI device, don't */
/* let HBA's be valid device for cdrecord, but mark */
@@ -301,14 +301,14 @@
if (strstr(class, "HBA") == NULL) {
if (strstr(class, "DISK") != NULL) {
if (scan_disks)
- sdidevs[scg][tgt][lun].flags |= SDI_VALID;
+ sdidevs[usal][tgt][lun].flags |= SDI_VALID;
else
- sdidevs[scg][tgt][lun].flags &= ~SDI_VALID;
+ sdidevs[usal][tgt][lun].flags &= ~SDI_VALID;
} else {
- sdidevs[scg][tgt][lun].flags |= SDI_VALID;
+ sdidevs[usal][tgt][lun].flags |= SDI_VALID;
}
} else {
- sdidevs[scg][tgt][lun].flags |= SDI_INITIATOR;
+ sdidevs[usal][tgt][lun].flags |= SDI_INITIATOR;
}
@@ -323,45 +323,45 @@
/*
* Fill the sdidevs array with all we know now.
* Do not overwrite fields that may contain old state like
- * sdidevs[scg][tgt][lun].open
+ * sdidevs[usal][tgt][lun].open
*/
if (atapi)
- sdidevs[scg][tgt][lun].flags |= SDI_ATAPI;
+ sdidevs[usal][tgt][lun].flags |= SDI_ATAPI;
else
- sdidevs[scg][tgt][lun].flags &= ~SDI_ATAPI;
+ sdidevs[usal][tgt][lun].flags &= ~SDI_ATAPI;
- sdidevs[scg][tgt][lun].hba = hba;
- sdidevs[scg][tgt][lun].bus = bus;
- sdidevs[scg][tgt][lun].tgt = tgt;
- sdidevs[scg][tgt][lun].lun = lun;
+ sdidevs[usal][tgt][lun].hba = hba;
+ sdidevs[usal][tgt][lun].bus = bus;
+ sdidevs[usal][tgt][lun].tgt = tgt;
+ sdidevs[usal][tgt][lun].lun = lun;
#ifdef SCG_DEBUG
- strcpy(sdidevs[scg][tgt][lun].type, class);
- strcpy(sdidevs[scg][tgt][lun].vend, ident);
+ strcpy(sdidevs[usal][tgt][lun].type, class);
+ strcpy(sdidevs[usal][tgt][lun].vend, ident);
- js_snprintf(sdidevs[scg][tgt][lun].devn,
- sizeof (sdidevs[scg][tgt][lun].devn),
- DEV_NAME, scg, tgt, lun);
+ js_snprintf(sdidevs[usal][tgt][lun].devn,
+ sizeof (sdidevs[usal][tgt][lun].devn),
+ DEV_NAME, usal, tgt, lun);
#endif
js_snprintf(devnm, sizeof (devnm),
- DEV_NAME, scg, tgt, lun);
+ DEV_NAME, usal, tgt, lun);
minor = SDI_MINOR(hba, tgt, lun, bus);
node = makedevice(major, minor);
- sdidevs[scg][tgt][lun].major = major;
- sdidevs[scg][tgt][lun].minor = minor;
- sdidevs[scg][tgt][lun].node = node;
+ sdidevs[usal][tgt][lun].major = major;
+ sdidevs[usal][tgt][lun].minor = minor;
+ sdidevs[usal][tgt][lun].node = node;
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"h = %d; b = %d, s = %d, t = %d, l = %d, a = %d, ma = %d, mi = %2d, dev = '%s', id = '%s'\n",
- hba, bus, scg, tgt, lun,
- (sdidevs[scg][tgt][lun].flags & SDI_ATAPI) != 0,
- sdidevs[scg][tgt][lun].major,
- sdidevs[scg][tgt][lun].minor,
+ hba, bus, usal, tgt, lun,
+ (sdidevs[usal][tgt][lun].flags & SDI_ATAPI) != 0,
+ sdidevs[usal][tgt][lun].major,
+ sdidevs[usal][tgt][lun].minor,
devnm,
ident);
}
@@ -370,8 +370,8 @@
}
if (xpclose(cmd) == -1) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Error pclose() for \"%s\"",
SCSI_CFG);
return (-1);
@@ -409,14 +409,14 @@
unlink(dname);
if (mknod(dname, S_IFCHR | 0700, ptdev) < 0) {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"mknod() error for \"%s\"", dname);
return (-1);
}
} else {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"mknod() error for \"%s\"", dname);
return (-1);
}
@@ -432,8 +432,8 @@
*/
fd = sdidevs[s][t][l].fd;
} else {
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"can not open pass-through %s", dname);
return (-1);
}
@@ -447,11 +447,11 @@
sdidevs[s][t][l].fd = fd;
sdidevs[s][t][l].open++;
nopen++;
- scglocal(scgp)->scgfiles[s][t][l] = (short) fd;
+ usallocal(usalp)->usalfiles[s][t][l] = (short) fd;
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"s = %d, t = %d, l = %d, dev = %s, fd = %d\n",
s, t, l,
devnm,
@@ -467,31 +467,31 @@
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
int b, t, l;
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -513,8 +513,8 @@
if (*device != '\0') { /* we don't allow old dev usage */
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open by 'devname' no longer supported on this OS");
return (-1);
} else { /* this is the new stuff */
@@ -524,28 +524,28 @@
/* with the new addressing */
/* scheme. */
- return (unixware_init(scgp));
+ return (unixware_init(usalp));
}
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
register int f;
register int b;
register int t;
register int l;
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
for (b = 0; b < MAX_SCG; b++) {
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++) {
- f = scglocal(scgp)->scgfiles[b][t][l];
+ f = usallocal(usalp)->usalfiles[b][t][l];
if (f >= 0) {
if (sdidevs[b][t][l].open > 0)
sdidevs[b][t][l].open--;
@@ -556,7 +556,7 @@
sdidevs[b][t][l].flags &= ~SDI_VALID;
}
}
- scglocal(scgp)->scgfiles[b][t][l] = (short)-1;
+ usallocal(usalp)->usalfiles[b][t][l] = (short)-1;
}
}
}
@@ -564,34 +564,34 @@
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
return (MAX_DMA);
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = (void *) valloc((size_t)(amt));
+ usalp->bufbase = (void *) valloc((size_t)(amt));
- return (scgp->bufbase);
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
register int t;
register int l;
@@ -599,39 +599,39 @@
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (FALSE);
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
- if (scglocal(scgp)->scgfiles[busno][t][l] >= 0)
+ if (usallocal(usalp)->usalfiles[busno][t][l] >= 0)
return (TRUE);
}
return (FALSE);
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= MAX_SCG ||
tgt < 0 || tgt >= MAX_TGT ||
tlun < 0 || tlun >= MAX_LUN)
return (-1);
- if (scgp->local == NULL)
+ if (usalp->local == NULL)
return (-1);
- return ((int)scglocal(scgp)->scgfiles[busno][tgt][tlun]);
+ return ((int)usallocal(usalp)->usalfiles[busno][tgt][tlun]);
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
register int t;
register int l;
register int busno;
- busno = scg_scsibus(scgp);
+ busno = usal_scsibus(usalp);
if (busno < 0 || busno >= MAX_SCG)
return (FALSE);
@@ -639,9 +639,9 @@
for (t = 0; t < MAX_TGT; t++) {
for (l = 0; l < MAX_LUN; l++)
if ((sdidevs[busno][t][l].flags & SDI_INITIATOR) != 0) {
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_initiator_id: id = %d\n", t);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_initiator_id: id = %d\n", t);
}
return (t);
}
@@ -651,17 +651,17 @@
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
/* if the new address method is used we know if this is ATAPI */
- return ((sdidevs[scg_scsibus(scgp)][scg_target(scgp)][scg_lun(scgp)].flags & SDI_ATAPI) != 0);
+ return ((sdidevs[usal_scsibus(usalp)][usal_target(usalp)][usal_lun(usalp)].flags & SDI_ATAPI) != 0);
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
- int f = scgp->fd;
+ int f = usalp->fd;
errno = EINVAL;
@@ -693,7 +693,7 @@
}
static int
-do_scg_cmd(SCSI *scgp, struct scg_cmd *sp)
+do_usal_cmd(SCSI *usalp, struct usal_cmd *sp)
{
int ret;
int i;
@@ -721,7 +721,7 @@
sp->error = SCG_NO_ERROR;
errno = 0;
for (;;) {
- if ((ret = ioctl(scgp->fd, SDI_SEND, &scsi_cmd)) < 0) {
+ if ((ret = ioctl(usalp->fd, SDI_SEND, &scsi_cmd)) < 0) {
if (errno == EAGAIN) {
sleep(1);
errno = 0;
@@ -813,10 +813,10 @@
static int
-do_scg_sense(SCSI *scgp, struct scg_cmd *sp)
+do_usal_sense(SCSI *usalp, struct usal_cmd *sp)
{
int ret;
- struct scg_cmd s_cmd;
+ struct usal_cmd s_cmd;
memset((caddr_t)&s_cmd, 0, sizeof (s_cmd));
@@ -830,7 +830,7 @@
s_cmd.cdb.g0_cdb.lun = sp->cdb.g0_cdb.lun;
s_cmd.cdb.g0_cdb.count = sp->sense_len;
- ret = do_scg_cmd(scgp, &s_cmd);
+ ret = do_usal_cmd(usalp, &s_cmd);
if (ret < 0)
return (ret);
@@ -840,22 +840,22 @@
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
int ret;
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
- ret = do_scg_cmd(scgp, sp);
+ ret = do_usal_cmd(usalp, sp);
if (ret < 0)
return (ret);
if (sp->u_scb.cmd_scb[0] & S_CKCON)
- ret = do_scg_sense(scgp, sp);
+ ret = do_usal_sense(usalp, sp);
return (ret);
}
Modified: cdrkit/trunk/libusal/scsi-vms.c
===================================================================
--- cdrkit/trunk/libscg/scsi-vms.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-vms.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -23,10 +23,10 @@
* 26 IDE controllers (DQ[A-Z][0-1]).
*
* This is a hack, that tries to emulate the functionality
- * of the scg driver.
+ * of the usal driver.
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -57,12 +57,12 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-vms.c-1.33"; /* The version for this transport*/
+static char _usal_trans_version[] = "scsi-vms.c-1.33"; /* The version for this transport*/
#define VMS_MAX_DK 4 /* DK[A-D] VMS device controllers */
#define VMS_MAX_GK 4 /* GK[A-D] VMS device controllers */
@@ -98,8 +98,8 @@
'u', 'v', 'w', 'x', 'y', 'z'};
-static int do_scg_cmd(SCSI *scgp, struct scg_cmd *sp);
-static int do_scg_sense(SCSI *scgp, struct scg_cmd *sp);
+static int do_usal_cmd(SCSI *usalp, struct usal_cmd *sp);
+static int do_usal_sense(SCSI *usalp, struct usal_cmd *sp);
#define DEVICE_NAMELEN 8
@@ -165,10 +165,10 @@
static FILE *fp;
-struct scg_local {
+struct usal_local {
Ushort gk_chan;
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
/*
* Return version information for the low level SCSI transport code.
@@ -176,19 +176,19 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -197,19 +197,19 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "IO$_DIAGNOSE", "Generic SCSI",
+ __usal_help(f, "IO$_DIAGNOSE", "Generic SCSI",
"", "bus,target,lun", "1,2,0", FALSE, FALSE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
char devname[DEVICE_NAMELEN];
char buschar;
char buschar1;
@@ -219,8 +219,8 @@
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
@@ -228,8 +228,8 @@
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2)) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open by 'devname' not supported on this OS");
return (-1);
}
@@ -238,15 +238,15 @@
* There is no real reason why we cannot scan on VMS,
* but for now it is not possible.
*/
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Unable to scan on VMS");
return (0);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
}
@@ -270,11 +270,11 @@
strcpy(gk_device, devname);
status = sys$assign(&gk_device_desc, &gk_chan, 0, 0);
if (!(status & 1)) {
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"Unable to access scsi-device \"%s\"\n", &gk_device[0]);
return (-1);
}
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
fp = fopen("cdrecord_io.log", "w", "rfm=stmlf", "rat=cr");
if (fp == NULL) {
perror("Failing opening i/o-logfile");
@@ -285,7 +285,7 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
/*
* XXX close gk_chan ???
@@ -300,13 +300,13 @@
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
return (MAX_DMA_VMS);
}
static BOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
if (gk_chan == 0)
return (FALSE);
@@ -314,7 +314,7 @@
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (gk_chan == 0)
return (-1);
@@ -322,15 +322,15 @@
}
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
- int busno = scg_scsibus(scgp);
+ int busno = usal_scsibus(usalp);
if (busno >= 8)
return (TRUE);
@@ -339,33 +339,33 @@
}
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
errno = EINVAL;
return (-1);
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = malloc((size_t)(amt)); /* XXX JS XXX valloc() ??? */
- return (scgp->bufbase);
+ usalp->bufbase = malloc((size_t)(amt)); /* XXX JS XXX valloc() ??? */
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static int
-do_scg_cmd(SCSI *scgp, struct scg_cmd *sp)
+do_usal_cmd(SCSI *usalp, struct usal_cmd *sp)
{
char *cmdadr;
int notcmdretry;
@@ -406,7 +406,7 @@
gk_desc.SCSI$L_RES_4 = 0; /* Reserved */
gk_desc.SCSI$L_RES_5 = 0; /* Reserved */
gk_desc.SCSI$L_RES_6 = 0; /* Reserved */
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
js_fprintf(fp, "***********************************************************\n");
js_fprintf(fp, "SCSI VMS-I/O parameters\n");
js_fprintf(fp, "OPCODE: %d", gk_desc.SCSI$L_OPCODE);
@@ -424,7 +424,7 @@
&gk_desc, sizeof (gk_desc), 0, 0, 0, 0);
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
js_fprintf(fp, "qiow-status: %i\n", status);
js_fprintf(fp, "VMS status code %i\n", gk_iosb.SCSI$W_VMS_STAT);
js_fprintf(fp, "Actual #bytes transferred %i\n", gk_iosb.SCSI$L_IOSB_TFR_CNT);
@@ -449,7 +449,7 @@
sp->resid = gk_desc.SCSI$L_DATA_LEN - gk_iosb.SCSI$L_IOSB_TFR_CNT;
- if (scgo_isatapi(scgp)) {
+ if (usalo_isatapi(usalp)) {
scsi_sts = ((gk_iosb.SCSI$B_IOSB_STS >> 4) & 0x7);
} else {
scsi_sts = gk_iosb.SCSI$B_IOSB_STS;
@@ -457,7 +457,7 @@
if (gk_iosb.SCSI$W_VMS_STAT == SS$_NORMAL && scsi_sts == 0) {
sp->error = SCG_NO_ERROR;
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
js_fprintf(fp, "scsi_sts == 0\n");
js_fprintf(fp, "gk_iosb.SCSI$B_IOSB_STS == 0\n");
js_fprintf(fp, "sp->error %i\n", sp->error);
@@ -470,7 +470,7 @@
if (severity == 4) {
sp->error = SCG_FATAL;
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
js_fprintf(fp, "scsi_sts & 2\n");
js_fprintf(fp, "gk_iosb.SCSI$B_IOSB_STS & 2\n");
js_fprintf(fp, "gk_iosb.SCSI$W_VMS_STAT & 0x7 == SS$_FATAL\n");
@@ -480,7 +480,7 @@
}
if (gk_iosb.SCSI$W_VMS_STAT == SS$_TIMEOUT) {
sp->error = SCG_TIMEOUT;
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
js_fprintf(fp, "scsi_sts & 2\n");
js_fprintf(fp, "gk_iosb.SCSI$B_IOSB_STS & 2\n");
js_fprintf(fp, "gk_iosb.SCSI$W_VMS_STAT == SS$_TIMEOUT\n");
@@ -490,7 +490,7 @@
}
sp->error = SCG_RETRYABLE;
sp->u_scb.cmd_scb[0] = scsi_sts;
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
js_fprintf(fp, "scsi_sts & 2\n");
js_fprintf(fp, "gk_iosb.SCSI$B_IOSB_STS & 2\n");
js_fprintf(fp, "gk_iosb.SCSI$W_VMS_STAT != 0\n");
@@ -500,10 +500,10 @@
}
static int
-do_scg_sense(SCSI *scgp, struct scg_cmd *sp)
+do_usal_sense(SCSI *usalp, struct usal_cmd *sp)
{
int ret;
- struct scg_cmd s_cmd;
+ struct usal_cmd s_cmd;
fillbytes((caddr_t)&s_cmd, sizeof (s_cmd), '\0');
s_cmd.addr = (char *)sp->u_sense.cmd_sense;
@@ -514,7 +514,7 @@
s_cmd.cdb.g0_cdb.cmd = SC_REQUEST_SENSE;
s_cmd.cdb.g0_cdb.lun = sp->cdb.g0_cdb.lun;
s_cmd.cdb.g0_cdb.count = sp->sense_len;
- ret = do_scg_cmd(scgp, &s_cmd);
+ ret = do_usal_cmd(usalp, &s_cmd);
if (ret < 0)
return (ret);
@@ -526,19 +526,19 @@
}
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
int ret;
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (0);
}
- ret = do_scg_cmd(scgp, sp);
+ ret = do_usal_cmd(usalp, sp);
if (ret < 0)
return (ret);
if (sp->u_scb.cmd_scb[0] & 02)
- ret = do_scg_sense(scgp, sp);
+ ret = do_usal_sense(usalp, sp);
return (ret);
}
Modified: cdrkit/trunk/libusal/scsi-wnt.c
===================================================================
--- cdrkit/trunk/libscg/scsi-wnt.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsi-wnt.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -21,7 +21,7 @@
* Both can be installed from ASPI_ME
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -61,8 +61,8 @@
*/
#define BOOL WBOOL /* This is the Win BOOL */
#define format __format
-#include <scg/aspi-win32.h>
-#include <scg/spti-wnt.h>
+#include <usal/aspi-win32.h>
+#include <usal/spti-wnt.h>
#undef format
#ifdef __CYGWIN32__ /* Use dlopen() */
@@ -71,13 +71,13 @@
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_version[] = "scsi-wnt.c-1.45"; /* The version for this transport*/
-static char _scg_itrans_version[] = "SPTI-scsi-wnt.c-1.45"; /* The version for SPTI */
+static char _usal_trans_version[] = "scsi-wnt.c-1.45"; /* The version for this transport*/
+static char _usal_itrans_version[] = "SPTI-scsi-wnt.c-1.45"; /* The version for SPTI */
/*
* Local defines and constants
@@ -91,10 +91,10 @@
#ifdef DEBUG_WNTASPI
#endif
-struct scg_local {
+struct usal_local {
int dummy;
};
-#define scglocal(p) ((struct scg_local *)((p)->local))
+#define usallocal(p) ((struct usal_local *)((p)->local))
/*
* Local variables
@@ -116,18 +116,18 @@
*/
static void exit_func(void);
#ifdef DEBUG_WNTASPI
-static void DebugScsiSend(SCSI *scgp, SRB_ExecSCSICmd *s, int bDisplayBuffer);
+static void DebugScsiSend(SCSI *usalp, SRB_ExecSCSICmd *s, int bDisplayBuffer);
#endif
-static void copy_sensedata(SRB_ExecSCSICmd *cp, struct scg_cmd *sp);
-static void set_error(SRB_ExecSCSICmd *cp, struct scg_cmd *sp);
-static BOOL open_driver(SCSI *scgp);
-static BOOL load_aspi(SCSI *scgp);
+static void copy_sensedata(SRB_ExecSCSICmd *cp, struct usal_cmd *sp);
+static void set_error(SRB_ExecSCSICmd *cp, struct usal_cmd *sp);
+static BOOL open_driver(SCSI *usalp);
+static BOOL load_aspi(SCSI *usalp);
static BOOL close_driver(void);
-static int ha_inquiry(SCSI *scgp, int id, SRB_HAInquiry *ip);
+static int ha_inquiry(SCSI *usalp, int id, SRB_HAInquiry *ip);
#ifdef __USED__
-static int resetSCSIBus(SCSI *scgp);
+static int resetSCSIBus(SCSI *usalp);
#endif
-static int scsiabort(SCSI *scgp, SRB_ExecSCSICmd *sp);
+static int scsiabort(SCSI *usalp, SRB_ExecSCSICmd *sp);
/* SPTI Start ---------------------------------------------------------------*/
@@ -146,7 +146,7 @@
/* #define CREATE_NONSHARED 1 */ /* open CDROM-Device not SHARED if possible */
/* #define _DEBUG_SCSIPT 1 */
#ifdef _DEBUG_SCSIPT
-FILE *scgp_errfile; /* File for SPTI-Debug-Messages */
+FILE *usalp_errfile; /* File for SPTI-Debug-Messages */
#endif
#define SENSE_LEN_SPTI 32 /* Sense length for ASPI is only 14 */
@@ -438,7 +438,7 @@
dwFlags |= GENERIC_WRITE;
dwAccessMode |= FILE_SHARE_WRITE;
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, "SPTI: GetFileHandle(): Setting for Win2K\n");
+ js_fprintf(usalp_errfile, "SPTI: GetFileHandle(): Setting for Win2K\n");
#endif
}
js_snprintf(buf, sizeof (buf), "\\\\.\\%c:", (char)('A'+i));
@@ -476,9 +476,9 @@
}
#ifdef _DEBUG_SCSIPT
if (fh == INVALID_HANDLE_VALUE)
- js_fprintf(scgp_errfile, "SPTI: CreateFile() failed! -> %d\n", GetLastError());
+ js_fprintf(usalp_errfile, "SPTI: CreateFile() failed! -> %d\n", GetLastError());
else
- js_fprintf(scgp_errfile, "SPTI: CreateFile() returned %d\n", GetLastError());
+ js_fprintf(usalp_errfile, "SPTI: CreateFile() returned %d\n", GetLastError());
#endif
return (fh);
@@ -501,20 +501,20 @@
BYTE inqData[NTSCSI_HA_INQUIRY_SIZE];
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, "SPTI: Checking drive %c:", 'A'+i);
+ js_fprintf(usalp_errfile, "SPTI: Checking drive %c:", 'A'+i);
#endif
fh = GetFileHandle(i, TRUE); /* No NONSHARED Create for inquiry */
if (fh == INVALID_HANDLE_VALUE) {
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, " : fh == INVALID_HANDLE_VALUE\n");
+ js_fprintf(usalp_errfile, " : fh == INVALID_HANDLE_VALUE\n");
#endif
return;
}
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, " : Index %d: fh == %08X\n", i, fh);
+ js_fprintf(usalp_errfile, " : Index %d: fh == %08X\n", i, fh);
#endif
@@ -547,7 +547,7 @@
if (!status) {
CloseHandle(fh);
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, "SPTI: Error DeviceIoControl() -> %d\n", GetLastError());
+ js_fprintf(usalp_errfile, "SPTI: Error DeviceIoControl() -> %d\n", GetLastError());
#endif
return;
}
@@ -563,7 +563,7 @@
&scsiAddr, sizeof (SCSI_ADDRESS), &returned,
NULL)) {
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, "Device %c: Port=%d, PathId=%d, TargetId=%d, Lun=%d\n",
+ js_fprintf(usalp_errfile, "Device %c: Port=%d, PathId=%d, TargetId=%d, Lun=%d\n",
(char)i+'A', scsiAddr.PortNumber, scsiAddr.PathId,
scsiAddr.TargetId, scsiAddr.Lun);
#endif
@@ -586,18 +586,18 @@
pDrive->driveLetter = i;
pDrive->hDevice = INVALID_HANDLE_VALUE;
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, "USB/Firewire Device %c: Port=%d, TargetId=%d, Lun=%d\n", (char)i+'A', i, 0, 0);
+ js_fprintf(usalp_errfile, "USB/Firewire Device %c: Port=%d, TargetId=%d, Lun=%d\n", (char)i+'A', i, 0, 0);
#endif
} else {
pDrive->bUsed = FALSE;
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, "SPTI: Device %s: Error DeviceIoControl(): %d\n", (char)i+'A', GetLastError());
+ js_fprintf(usalp_errfile, "SPTI: Device %s: Error DeviceIoControl(): %d\n", (char)i+'A', GetLastError());
#endif
CloseHandle(fh);
return;
}
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, "SPTI: Adding drive %c: (%d:%d:%d)\n", 'A'+i,
+ js_fprintf(usalp_errfile, "SPTI: Adding drive %c: (%d:%d:%d)\n", 'A'+i,
pDrive->ha, pDrive->tgt, pDrive->lun);
#endif
CloseHandle(fh);
@@ -637,7 +637,7 @@
BYTE i;
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, "SPTI: SPTIGetDeviceIndex\n");
+ js_fprintf(usalp_errfile, "SPTI: SPTIGetDeviceIndex\n");
#endif
for (i = NUM_FLOPPY_DRIVES; i < NUM_MAX_NTSCSI_DRIVES; i++) {
@@ -701,8 +701,8 @@
length = sizeof (swb);
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, "SPTI: SPTIExecSCSICmd: calling DeviceIoControl()");
- js_fprintf(scgp_errfile, " : cmd == 0x%02X", swb.spt.Cdb[0]);
+ js_fprintf(usalp_errfile, "SPTI: SPTIExecSCSICmd: calling DeviceIoControl()");
+ js_fprintf(usalp_errfile, " : cmd == 0x%02X", swb.spt.Cdb[0]);
#endif
status = DeviceIoControl(sptiglobal.drive[idx].hDevice,
IOCTL_SCSI_PASS_THROUGH_DIRECT,
@@ -718,7 +718,7 @@
if (status && swb.spt.ScsiStatus == 0) {
lpsrb->SRB_Status = SS_COMP;
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, " : SRB_Status == SS_COMP\n");
+ js_fprintf(usalp_errfile, " : SRB_Status == SS_COMP\n");
#endif
} else {
DWORD dwErrCode;
@@ -729,7 +729,7 @@
dwErrCode = GetLastError();
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, " : error == %d handle == %08X\n", dwErrCode, sptiglobal.drive[idx].hDevice);
+ js_fprintf(usalp_errfile, " : error == %d handle == %08X\n", dwErrCode, sptiglobal.drive[idx].hDevice);
#endif
/*
* KLUDGE ALERT! KLUDGE ALERT! KLUDGE ALERT!
@@ -753,7 +753,7 @@
}
}
#ifdef _DEBUG_SCSIPT
- js_fprintf(scgp_errfile, "SPTI: SPTIExecSCSICommand: Retrying after ERROR_MEDIA_CHANGED\n");
+ js_fprintf(usalp_errfile, "SPTI: SPTIExecSCSICommand: Retrying after ERROR_MEDIA_CHANGED\n");
#endif
return (SPTIExecSCSICommand(lpsrb, sptTimeOutValue, TRUE));
}
@@ -776,21 +776,21 @@
* in applications.
*/
static char *
-scgo_version(SCSI *scgp, int what)
+usalo_version(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
if (bUsingSCSIPT)
- return (_scg_itrans_version);
- return (_scg_trans_version);
+ return (_usal_itrans_version);
+ return (_usal_trans_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -799,26 +799,26 @@
}
static int
-scgo_help(SCSI *scgp, FILE *f)
+usalo_help(SCSI *usalp, FILE *f)
{
- __scg_help(f, "ASPI", "Generic transport independent SCSI",
+ __usal_help(f, "ASPI", "Generic transport independent SCSI",
"ASPI:", "bus,target,lun", "ASPI:1,2,0", TRUE, FALSE);
- __scg_help(f, "SPTI", "Generic SCSI for Windows NT/2000/XP",
+ __usal_help(f, "SPTI", "Generic SCSI for Windows NT/2000/XP",
"SPTI:", "bus,target,lun", "SPTI:1,2,0", TRUE, FALSE);
return (0);
}
static int
-scgo_open(SCSI *scgp, char *device)
+usalo_open(SCSI *usalp, char *device)
{
- int busno = scg_scsibus(scgp);
- int tgt = scg_target(scgp);
- int tlun = scg_lun(scgp);
+ int busno = usal_scsibus(usalp);
+ int tgt = usal_target(usalp);
+ int tlun = usal_lun(usalp);
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Illegal value for busno, target or lun '%d,%d,%d'",
busno, tgt, tlun);
return (-1);
@@ -830,8 +830,8 @@
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2)) {
errno = EINVAL;
- if (scgp->errstr)
- js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE,
+ if (usalp->errstr)
+ js_snprintf(usalp->errstr, SCSI_ERRSTR_SIZE,
"Open by 'devname' not supported on this OS");
return (-1);
}
@@ -846,9 +846,9 @@
if (!w2k_or_newer())
bUsingSCSIPT = FALSE;
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_open: Prefered SCSI transport: %s\n",
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_open: Prefered SCSI transport: %s\n",
bUsingSCSIPT ? "SPTI":"ASPI");
}
if (device != NULL && strcmp(device, "SPTI") == 0) {
@@ -858,9 +858,9 @@
bUsingSCSIPT = FALSE;
bForceAccess = TRUE;
}
- if (device != NULL && scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_open: Selected SCSI transport: %s\n",
+ if (device != NULL && usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_open: Selected SCSI transport: %s\n",
bUsingSCSIPT ? "SPTI":"ASPI");
}
}
@@ -884,15 +884,15 @@
return (-1);
}
- if (scgp->local == NULL) {
- scgp->local = malloc(sizeof (struct scg_local));
- if (scgp->local == NULL)
+ if (usalp->local == NULL) {
+ usalp->local = malloc(sizeof (struct usal_local));
+ if (usalp->local == NULL)
return (0);
}
/*
* Try to open ASPI-Router
*/
- if (!open_driver(scgp))
+ if (!open_driver(usalp))
return (-1);
/*
@@ -915,39 +915,39 @@
}
static int
-scgo_close(SCSI *scgp)
+usalo_close(SCSI *usalp)
{
exit_func();
return (0);
}
static long
-scgo_maxdma(SCSI *scgp, long amt)
+usalo_maxdma(SCSI *usalp, long amt)
{
return (MAX_DMA_WNT);
}
static void *
-scgo_getbuf(SCSI *scgp, long amt)
+usalo_getbuf(SCSI *usalp, long amt)
{
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "scgo_getbuf: %ld bytes\n", amt);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "usalo_getbuf: %ld bytes\n", amt);
}
- scgp->bufbase = malloc((size_t)(amt));
- return (scgp->bufbase);
+ usalp->bufbase = malloc((size_t)(amt));
+ return (usalp->bufbase);
}
static void
-scgo_freebuf(SCSI *scgp)
+usalo_freebuf(SCSI *usalp)
{
- if (scgp->bufbase)
- free(scgp->bufbase);
- scgp->bufbase = NULL;
+ if (usalp->bufbase)
+ free(usalp->bufbase);
+ usalp->bufbase = NULL;
}
static __SBOOL
-scgo_havebus(SCSI *scgp, int busno)
+usalo_havebus(SCSI *usalp, int busno)
{
if (busno < 0 || busno >= busses)
return (FALSE);
@@ -956,7 +956,7 @@
}
static int
-scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun)
{
if (busno < 0 || busno >= busses ||
tgt < 0 || tgt >= MAX_TGT ||
@@ -971,27 +971,27 @@
static int
-scgo_initiator_id(SCSI *scgp)
+usalo_initiator_id(SCSI *usalp)
{
SRB_HAInquiry s;
- if (ha_inquiry(scgp, scg_scsibus(scgp), &s) < 0)
+ if (ha_inquiry(usalp, usal_scsibus(usalp), &s) < 0)
return (-1);
return (s.HA_SCSI_ID);
}
static int
-scgo_isatapi(SCSI *scgp)
+usalo_isatapi(SCSI *usalp)
{
return (-1); /* XXX Need to add real test */
}
/*
- * XXX scgo_reset not yet tested
+ * XXX usalo_reset not yet tested
*/
static int
-scgo_reset(SCSI *scgp, int what)
+usalo_reset(SCSI *usalp, int what)
{
DWORD Status = 0;
@@ -1010,7 +1010,7 @@
return (-1);
}
if (bUsingSCSIPT) {
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"Reset SCSI device not implemented with SPTI\n");
return (-1);
}
@@ -1018,8 +1018,8 @@
/*
* XXX Does this reset TGT or BUS ???
*/
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"Attempting to reset SCSI device\n");
}
@@ -1027,8 +1027,8 @@
* Check if ASPI library is loaded
*/
if (AspiLoaded <= 0) {
- js_fprintf((FILE *)scgp->errfile,
- "error in scgo_reset: ASPI driver not loaded !\n");
+ js_fprintf((FILE *)usalp->errfile,
+ "error in usalo_reset: ASPI driver not loaded !\n");
return (-1);
}
@@ -1040,10 +1040,10 @@
* Set structure variables
*/
s.SRB_Cmd = SC_RESET_DEV; /* ASPI command code = SC_RESET_DEV */
- s.SRB_HaId = scg_scsibus(scgp); /* ASPI host adapter number */
+ s.SRB_HaId = usal_scsibus(usalp); /* ASPI host adapter number */
s.SRB_Flags = SRB_EVENT_NOTIFY; /* Flags */
- s.SRB_Target = scg_target(scgp); /* Target's SCSI ID */
- s.SRB_Lun = scg_lun(scgp); /* Target's LUN number */
+ s.SRB_Target = usal_target(usalp); /* Target's SCSI ID */
+ s.SRB_Lun = usal_lun(usalp); /* Target's LUN number */
s.SRB_PostProc = (LPVOID)Event; /* Post routine */
/*
@@ -1082,7 +1082,7 @@
* Check condition
*/
if (s.SRB_Status != SS_COMP) {
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"ERROR! 0x%08X\n", s.SRB_Status);
/*
@@ -1091,8 +1091,8 @@
return (-1);
}
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"Reset SCSI device completed\n");
}
@@ -1105,43 +1105,43 @@
#ifdef DEBUG_WNTASPI
static void
-DebugScsiSend(SCSI *scgp, SRB_ExecSCSICmd *s, int bDisplayBuffer)
+DebugScsiSend(SCSI *usalp, SRB_ExecSCSICmd *s, int bDisplayBuffer)
{
int i;
- js_fprintf((FILE *)scgp->errfile, "\n\nDebugScsiSend\n");
- js_fprintf((FILE *)scgp->errfile, "s->SRB_Cmd = 0x%02x\n", s->SRB_Cmd);
- js_fprintf((FILE *)scgp->errfile, "s->SRB_HaId = 0x%02x\n", s->SRB_HaId);
- js_fprintf((FILE *)scgp->errfile, "s->SRB_Flags = 0x%02x\n", s->SRB_Flags);
- js_fprintf((FILE *)scgp->errfile, "s->SRB_Target = 0x%02x\n", s->SRB_Target);
- js_fprintf((FILE *)scgp->errfile, "s->SRB_Lun = 0x%02x\n", s->SRB_Lun);
- js_fprintf((FILE *)scgp->errfile, "s->SRB_BufLen = 0x%02x\n", s->SRB_BufLen);
- js_fprintf((FILE *)scgp->errfile, "s->SRB_BufPointer = %x\n", s->SRB_BufPointer);
- js_fprintf((FILE *)scgp->errfile, "s->SRB_CDBLen = 0x%02x\n", s->SRB_CDBLen);
- js_fprintf((FILE *)scgp->errfile, "s->SRB_SenseLen = 0x%02x\n", s->SRB_SenseLen);
- js_fprintf((FILE *)scgp->errfile, "s->CDBByte =");
+ js_fprintf((FILE *)usalp->errfile, "\n\nDebugScsiSend\n");
+ js_fprintf((FILE *)usalp->errfile, "s->SRB_Cmd = 0x%02x\n", s->SRB_Cmd);
+ js_fprintf((FILE *)usalp->errfile, "s->SRB_HaId = 0x%02x\n", s->SRB_HaId);
+ js_fprintf((FILE *)usalp->errfile, "s->SRB_Flags = 0x%02x\n", s->SRB_Flags);
+ js_fprintf((FILE *)usalp->errfile, "s->SRB_Target = 0x%02x\n", s->SRB_Target);
+ js_fprintf((FILE *)usalp->errfile, "s->SRB_Lun = 0x%02x\n", s->SRB_Lun);
+ js_fprintf((FILE *)usalp->errfile, "s->SRB_BufLen = 0x%02x\n", s->SRB_BufLen);
+ js_fprintf((FILE *)usalp->errfile, "s->SRB_BufPointer = %x\n", s->SRB_BufPointer);
+ js_fprintf((FILE *)usalp->errfile, "s->SRB_CDBLen = 0x%02x\n", s->SRB_CDBLen);
+ js_fprintf((FILE *)usalp->errfile, "s->SRB_SenseLen = 0x%02x\n", s->SRB_SenseLen);
+ js_fprintf((FILE *)usalp->errfile, "s->CDBByte =");
for (i = 0; i < min(s->SRB_CDBLen, 16); i++) {
- js_fprintf((FILE *)scgp->errfile, " %02X ", s->CDBByte[i]);
+ js_fprintf((FILE *)usalp->errfile, " %02X ", s->CDBByte[i]);
}
- js_fprintf((FILE *)scgp->errfile, "\n");
+ js_fprintf((FILE *)usalp->errfile, "\n");
/*
if (bDisplayBuffer != 0 && s->SRB_BufLen >= 8) {
- js_fprintf((FILE *)scgp->errfile, "s->SRB_BufPointer =");
+ js_fprintf((FILE *)usalp->errfile, "s->SRB_BufPointer =");
for (i = 0; i < 8; i++) {
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
" %02X ", ((char *)s->SRB_BufPointer)[i]);
}
- js_fprintf((FILE *)scgp->errfile, "\n");
+ js_fprintf((FILE *)usalp->errfile, "\n");
}
*/
- js_fprintf((FILE *)scgp->errfile, "Debug done\n");
+ js_fprintf((FILE *)usalp->errfile, "Debug done\n");
}
#endif
static void
-copy_sensedata(SRB_ExecSCSICmd *cp, struct scg_cmd *sp)
+copy_sensedata(SRB_ExecSCSICmd *cp, struct usal_cmd *sp)
{
sp->sense_count = cp->SRB_SenseLen;
if (sp->sense_count > sp->sense_len)
@@ -1157,7 +1157,7 @@
* Set error flags
*/
static void
-set_error(SRB_ExecSCSICmd *cp, struct scg_cmd *sp)
+set_error(SRB_ExecSCSICmd *cp, struct usal_cmd *sp)
{
switch (cp->SRB_Status) {
@@ -1242,9 +1242,9 @@
};
static int
-scgo_send(SCSI *scgp)
+usalo_send(SCSI *usalp)
{
- struct scg_cmd *sp = scgp->scmd;
+ struct usal_cmd *sp = usalp->scmd;
DWORD Status = 0;
DWORD EventStatus = WAIT_OBJECT_0;
HANDLE Event = NULL;
@@ -1257,12 +1257,12 @@
* Check if ASPI library is loaded
*/
if (AspiLoaded <= 0) {
- errmsgno(EX_BAD, "error in scgo_send: ASPI driver not loaded.\n");
+ errmsgno(EX_BAD, "error in usalo_send: ASPI driver not loaded.\n");
sp->error = SCG_FATAL;
return (0);
}
- if (scgp->fd < 0) {
+ if (usalp->fd < 0) {
sp->error = SCG_FATAL;
return (-1);
}
@@ -1283,8 +1283,8 @@
if (sp->cdb_len > 16) {
sp->error = SCG_FATAL;
sp->ux_errno = EINVAL;
- js_fprintf((FILE *)scgp->errfile,
- "sp->cdb_len > sizeof (SRB_ExecSCSICmd.CDBByte). Fatal error in scgo_send, exiting...\n");
+ js_fprintf((FILE *)usalp->errfile,
+ "sp->cdb_len > sizeof (SRB_ExecSCSICmd.CDBByte). Fatal error in usalo_send, exiting...\n");
return (-1);
}
/*
@@ -1298,10 +1298,10 @@
* Fill ASPI structure
*/
s->SRB_Cmd = SC_EXEC_SCSI_CMD; /* SCSI Command */
- s->SRB_HaId = scg_scsibus(scgp); /* Host adapter number */
+ s->SRB_HaId = usal_scsibus(usalp); /* Host adapter number */
s->SRB_Flags = SRB_EVENT_NOTIFY; /* Flags */
- s->SRB_Target = scg_target(scgp); /* Target SCSI ID */
- s->SRB_Lun = scg_lun(scgp); /* Target SCSI LUN */
+ s->SRB_Target = usal_target(usalp); /* Target SCSI ID */
+ s->SRB_Lun = usal_lun(usalp); /* Target SCSI LUN */
s->SRB_BufLen = sp->size; /* # of bytes transferred */
s->SRB_BufPointer = sp->addr; /* pointer to data buffer */
s->SRB_CDBLen = sp->cdb_len; /* SCSI command length */
@@ -1329,8 +1329,8 @@
/*
* Dump some debug information when enabled
*/
- DebugScsiSend(scgp, s, TRUE);
-/* DebugScsiSend(scgp, s, (s->SRB_Flags&SRB_DIR_OUT) == SRB_DIR_OUT);*/
+ DebugScsiSend(usalp, s, TRUE);
+/* DebugScsiSend(usalp, s, (s->SRB_Flags&SRB_DIR_OUT) == SRB_DIR_OUT);*/
#endif
/*
@@ -1340,7 +1340,7 @@
ResetEvent(Event); /* Clear event handle */
if (bUsingSCSIPT) {
#ifdef _DEBUG_SCSIPT
- scgp_errfile = (FILE *)scgp->errfile;
+ usalp_errfile = (FILE *)usalp->errfile;
#endif
Status = SPTIExecSCSICommand(s, sp->timeout, FALSE);
}
@@ -1357,11 +1357,11 @@
ResetEvent(Event); /* Clear event, time out */
if (s->SRB_Status == SS_PENDING) { /* Check if we got a timeout */
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"Timeout....\n");
}
- scsiabort(scgp, s);
+ scsiabort(usalp, s);
ResetEvent(Event); /* Clear event, time out */
CloseHandle(Event); /* Close the event handle */
@@ -1375,16 +1375,16 @@
* Check ASPI command status
*/
if (s->SRB_Status != SS_COMP) {
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
- "Error in scgo_send: s->SRB_Status is 0x%x\n", s->SRB_Status);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
+ "Error in usalo_send: s->SRB_Status is 0x%x\n", s->SRB_Status);
}
set_error(s, sp); /* Set error flags */
copy_sensedata(s, sp); /* Copy sense and status */
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"Mapped to: error %d errno: %d\n", sp->error, sp->ux_errno);
}
return (1);
@@ -1409,7 +1409,7 @@
* *
***************************************************************************/
static BOOL
-open_driver(SCSI *scgp)
+open_driver(SCSI *usalp)
{
DWORD astatus;
BYTE HACount;
@@ -1417,7 +1417,7 @@
int i;
#ifdef DEBUG_WNTASPI
- js_fprintf((FILE *)scgp->errfile, "enter open_driver\n");
+ js_fprintf((FILE *)usalp->errfile, "enter open_driver\n");
#endif
/*
@@ -1432,7 +1432,7 @@
* Load the ASPI library or SPTI
*/
#ifdef _DEBUG_SCSIPT
- scgp_errfile = (FILE *)scgp->errfile;
+ usalp_errfile = (FILE *)usalp->errfile;
#endif
#ifdef PREFER_SPTI
if (bUsingSCSIPT)
@@ -1443,7 +1443,7 @@
#else
if (!bUsingSCSIPT || !bForceAccess) {
#endif
- if (load_aspi(scgp)) {
+ if (load_aspi(usalp)) {
AspiLoaded++;
bUsingSCSIPT = FALSE;
}
@@ -1460,14 +1460,14 @@
if (errno == 0)
errno = ENOSYS;
}
- js_fprintf((FILE *)scgp->errfile, "Can not load %s driver! ",
+ js_fprintf((FILE *)usalp->errfile, "Can not load %s driver! ",
bUsingSCSIPT ? "SPTI":"ASPI");
return (FALSE);
}
if (bUsingSCSIPT) {
- if (scgp->debug > 0)
- js_fprintf((FILE *)scgp->errfile, "using SPTI Transport\n");
+ if (usalp->debug > 0)
+ js_fprintf((FILE *)usalp->errfile, "using SPTI Transport\n");
if (!sptiglobal.numAdapters)
astatus = (DWORD)(MAKEWORD(0, SS_NO_ADAPTERS));
@@ -1480,27 +1480,27 @@
ASPIStatus = HIBYTE(LOWORD(astatus));
HACount = LOBYTE(LOWORD(astatus));
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"open_driver %lX HostASPIStatus=0x%x HACount=0x%x\n", astatus, ASPIStatus, HACount);
}
if (ASPIStatus != SS_COMP && ASPIStatus != SS_NO_ADAPTERS) {
- js_fprintf((FILE *)scgp->errfile, "Could not find any host adapters\n");
- js_fprintf((FILE *)scgp->errfile, "ASPIStatus == 0x%02X", ASPIStatus);
+ js_fprintf((FILE *)usalp->errfile, "Could not find any host adapters\n");
+ js_fprintf((FILE *)usalp->errfile, "ASPIStatus == 0x%02X", ASPIStatus);
return (FALSE);
}
busses = HACount;
#ifdef DEBUG_WNTASPI
- js_fprintf((FILE *)scgp->errfile, "open_driver HostASPIStatus=0x%x HACount=0x%x\n", ASPIStatus, HACount);
- js_fprintf((FILE *)scgp->errfile, "leaving open_driver\n");
+ js_fprintf((FILE *)usalp->errfile, "open_driver HostASPIStatus=0x%x HACount=0x%x\n", ASPIStatus, HACount);
+ js_fprintf((FILE *)usalp->errfile, "leaving open_driver\n");
#endif
for (i = 0; i < busses; i++) {
SRB_HAInquiry s;
- ha_inquiry(scgp, i, &s);
+ ha_inquiry(usalp, i, &s);
}
/*
@@ -1510,7 +1510,7 @@
}
static BOOL
-load_aspi(SCSI *scgp)
+load_aspi(SCSI *usalp)
{
#ifdef __CYGWIN32__
hAspiLib = dlopen("WNASPI32", RTLD_NOW);
@@ -1522,7 +1522,7 @@
*/
if (hAspiLib == NULL) {
#ifdef not_done_later
- js_fprintf((FILE *)scgp->errfile, "Can not load ASPI driver! ");
+ js_fprintf((FILE *)usalp->errfile, "Can not load ASPI driver! ");
#endif
return (FALSE);
}
@@ -1540,13 +1540,13 @@
#endif
if ((pfnGetASPI32SupportInfo == NULL) || (pfnSendASPI32Command == NULL)) {
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"ASPI function not found in library! ");
return (FALSE);
}
/*
- * The following functions are currently not used by libscg.
+ * The following functions are currently not used by libusal.
* If we start to use them, we need to check whether the founctions
* could be found in the ASPI library that just has been loaded.
*/
@@ -1611,7 +1611,7 @@
}
static int
-ha_inquiry(SCSI *scgp, int id, SRB_HAInquiry *ip)
+ha_inquiry(SCSI *usalp, int id, SRB_HAInquiry *ip)
{
DWORD Status;
@@ -1625,13 +1625,13 @@
else
Status = pfnSendASPI32Command((LPSRB)ip);
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile, "Status : %ld\n", Status);
- js_fprintf((FILE *)scgp->errfile, "hacount: %d\n", ip->HA_Count);
- js_fprintf((FILE *)scgp->errfile, "SCSI id: %d\n", ip->HA_SCSI_ID);
- js_fprintf((FILE *)scgp->errfile, "Manager: '%.16s'\n", ip->HA_ManagerId);
- js_fprintf((FILE *)scgp->errfile, "Identif: '%.16s'\n", ip->HA_Identifier);
- scg_prbytes("Unique:", ip->HA_Unique, 16);
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile, "Status : %ld\n", Status);
+ js_fprintf((FILE *)usalp->errfile, "hacount: %d\n", ip->HA_Count);
+ js_fprintf((FILE *)usalp->errfile, "SCSI id: %d\n", ip->HA_SCSI_ID);
+ js_fprintf((FILE *)usalp->errfile, "Manager: '%.16s'\n", ip->HA_ManagerId);
+ js_fprintf((FILE *)usalp->errfile, "Identif: '%.16s'\n", ip->HA_Identifier);
+ usal_prbytes("Unique:", ip->HA_Unique, 16);
}
if (ip->SRB_Status != SS_COMP)
return (-1);
@@ -1640,19 +1640,19 @@
#ifdef __USED__
static int
-resetSCSIBus(SCSI *scgp)
+resetSCSIBus(SCSI *usalp)
{
DWORD Status;
HANDLE Event;
SRB_BusDeviceReset s;
if (bUsingSCSIPT) {
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"Reset SCSI bus not implemented with SPTI\n");
return (FALSE);
}
- js_fprintf((FILE *)scgp->errfile, "Attempting to reset SCSI bus\n");
+ js_fprintf((FILE *)usalp->errfile, "Attempting to reset SCSI bus\n");
Event = CreateEvent(NULL, TRUE, FALSE, NULL);
@@ -1693,7 +1693,7 @@
* Check condition
*/
if (s.SRB_Status != SS_COMP) {
- js_fprintf((FILE *)scgp->errfile, "ERROR 0x%08X\n", s.SRB_Status);
+ js_fprintf((FILE *)usalp->errfile, "ERROR 0x%08X\n", s.SRB_Status);
/*
* Indicate that error has occured
@@ -1709,19 +1709,19 @@
#endif /* __USED__ */
static int
-scsiabort(SCSI *scgp, SRB_ExecSCSICmd *sp)
+scsiabort(SCSI *usalp, SRB_ExecSCSICmd *sp)
{
DWORD Status = 0;
SRB_Abort s;
if (bUsingSCSIPT) {
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"Abort SCSI not implemented with SPTI\n");
return (FALSE);
}
- if (scgp->debug > 0) {
- js_fprintf((FILE *)scgp->errfile,
+ if (usalp->debug > 0) {
+ js_fprintf((FILE *)usalp->errfile,
"Attempting to abort SCSI command\n");
}
@@ -1729,7 +1729,7 @@
* Check if ASPI library is loaded
*/
if (AspiLoaded <= 0) {
- js_fprintf((FILE *)scgp->errfile,
+ js_fprintf((FILE *)usalp->errfile,
"error in scsiabort: ASPI driver not loaded !\n");
return (FALSE);
}
@@ -1738,7 +1738,7 @@
* Set structure variables
*/
s.SRB_Cmd = SC_ABORT_SRB; /* ASPI command code = SC_ABORT_SRB */
- s.SRB_HaId = scg_scsibus(scgp); /* ASPI host adapter number */
+ s.SRB_HaId = usal_scsibus(usalp); /* ASPI host adapter number */
s.SRB_Flags = 0; /* Flags */
s.SRB_ToAbort = (LPSRB)&sp; /* sp */
@@ -1751,7 +1751,7 @@
* Check condition
*/
if (s.SRB_Status != SS_COMP) {
- js_fprintf((FILE *)scgp->errfile, "Abort ERROR! 0x%08X\n", s.SRB_Status);
+ js_fprintf((FILE *)usalp->errfile, "Abort ERROR! 0x%08X\n", s.SRB_Status);
/*
* Indicate that error has occured
@@ -1759,8 +1759,8 @@
return (FALSE);
}
- if (scgp->debug > 0)
- js_fprintf((FILE *)scgp->errfile, "Abort SCSI command completed\n");
+ if (usalp->debug > 0)
+ js_fprintf((FILE *)usalp->errfile, "Abort SCSI command completed\n");
/*
* Everything went OK
Modified: cdrkit/trunk/libusal/scsierrs.c
===================================================================
--- cdrkit/trunk/libscg/scsierrs.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsierrs.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -42,12 +42,12 @@
#include <standard.h>
#include <schily.h>
-#include <scg/scsireg.h>
-#include <scg/scsidefs.h>
-#include <scg/scgcmd.h> /*XXX JS wird eigentlich nicht benoetigt!! */
+#include <usal/scsireg.h>
+#include <usal/scsidefs.h>
+#include <usal/usalcmd.h> /*XXX JS wird eigentlich nicht benoetigt!! */
/*XXX JS kommt weg, wenn struct sense und status */
- /*XXX JS von scgio.h nach scsireg.h kommen */
-#include <scg/scsitransp.h>
+ /*XXX JS von usalio.h nach scsireg.h kommen */
+#include <usal/scsitransp.h>
#define CTYPE_CCS 0
#define CTYPE_MD21 1
@@ -56,8 +56,8 @@
#define SMO_C501
-const char *scg_sensemsg(int, int, int, const char **, char *, int maxcnt);
-int scg__errmsg(SCSI *scgp, char *obuf, int maxcnt, struct scsi_sense *,
+const char *usal_sensemsg(int, int, int, const char **, char *, int maxcnt);
+int usal__errmsg(SCSI *usalp, char *obuf, int maxcnt, struct scsi_sense *,
struct scsi_status *, int);
/*
* Map old non extended sense to sense key.
@@ -693,7 +693,7 @@
};
const char *
-scg_sensemsg(register int ctype, register int code, register int qual,
+usal_sensemsg(register int ctype, register int code, register int qual,
register const char **vec, char *sbuf, int maxcnt)
{
register int i;
@@ -766,9 +766,9 @@
return (sbuf);
}
-#undef sense /*XXX JS Hack, solange scgio.h noch nicht fertig ist */
+#undef sense /*XXX JS Hack, solange usalio.h noch nicht fertig ist */
int
-scg__errmsg(SCSI *scgp, char *obuf, int maxcnt,
+usal__errmsg(SCSI *usalp, char *obuf, int maxcnt,
register struct scsi_sense *sense,
register struct scsi_status *status, int sense_code)
{
@@ -829,9 +829,9 @@
}
blkvalid = sense->adr_val;
- sensemsg = scg_sensemsg(scgp->dev, code, qual, scgp->nonstderrs, sbuf, sizeof(sbuf));
+ sensemsg = usal_sensemsg(usalp->dev, code, qual, usalp->nonstderrs, sbuf, sizeof(sbuf));
if (sensemsg == NULL) {
- sensemsg = scg_sensemsg(scgp->dev, code, 0, scgp->nonstderrs, sbuf, sizeof(sbuf));
+ sensemsg = usal_sensemsg(usalp->dev, code, 0, usalp->nonstderrs, sbuf, sizeof(sbuf));
badqual = 1;
}
}
Modified: cdrkit/trunk/libusal/scsihack.c
===================================================================
--- cdrkit/trunk/libscg/scsihack.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsihack.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -17,7 +17,7 @@
#endif
/*
* Interface for other generic SCSI implementations.
- * Emulate the functionality of /dev/scg? with the local
+ * Emulate the functionality of /dev/usal? with the local
* SCSI user land implementation.
*
* To add a new hack, add something like:
@@ -29,7 +29,7 @@
*
* Warning: you may change this source or add new SCSI tranport
* implementations, but if you do that you need to change the
- * _scg_version and _scg_auth* string that are returned by the
+ * _usal_version and _usal_auth* string that are returned by the
* SCSI transport code.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -69,45 +69,45 @@
#include <strdefs.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsitransp.h>
-#include "scgtimes.h"
+#include <usal/usalcmd.h>
+#include <usal/scsitransp.h>
+#include "usaltimes.h"
#ifndef HAVE_ERRNO_DEF
extern int errno;
#endif
-static int scgo_send(SCSI *scgp);
-static char *scgo_version(SCSI *scgp, int what);
-static int scgo_help(SCSI *scgp, FILE *f);
-static int scgo_open(SCSI *scgp, char *device);
-static int scgo_close(SCSI *scgp);
-static long scgo_maxdma(SCSI *scgp, long amt);
-static void *scgo_getbuf(SCSI *scgp, long amt);
-static void scgo_freebuf(SCSI *scgp);
+static int usalo_send(SCSI *usalp);
+static char *usalo_version(SCSI *usalp, int what);
+static int usalo_help(SCSI *usalp, FILE *f);
+static int usalo_open(SCSI *usalp, char *device);
+static int usalo_close(SCSI *usalp);
+static long usalo_maxdma(SCSI *usalp, long amt);
+static void *usalo_getbuf(SCSI *usalp, long amt);
+static void usalo_freebuf(SCSI *usalp);
-static BOOL scgo_havebus(SCSI *scgp, int busno);
-static int scgo_fileno(SCSI *scgp, int busno, int tgt, int tlun);
-static int scgo_initiator_id(SCSI *scgp);
-static int scgo_isatapi(SCSI *scgp);
-static int scgo_reset(SCSI *scgp, int what);
+static BOOL usalo_havebus(SCSI *usalp, int busno);
+static int usalo_fileno(SCSI *usalp, int busno, int tgt, int tlun);
+static int usalo_initiator_id(SCSI *usalp);
+static int usalo_isatapi(SCSI *usalp);
+static int usalo_reset(SCSI *usalp, int what);
-static char _scg_auth_cdrkit[] = "cdrkit-team"; /* The author for this module */
+static char _usal_auth_cdrkit[] = "cdrkit-team"; /* The author for this module */
-scg_ops_t scg_std_ops = {
- scgo_send,
- scgo_version,
- scgo_help,
- scgo_open,
- scgo_close,
- scgo_maxdma,
- scgo_getbuf,
- scgo_freebuf,
- scgo_havebus,
- scgo_fileno,
- scgo_initiator_id,
- scgo_isatapi,
- scgo_reset,
+usal_ops_t usal_std_ops = {
+ usalo_send,
+ usalo_version,
+ usalo_help,
+ usalo_open,
+ usalo_close,
+ usalo_maxdma,
+ usalo_getbuf,
+ usalo_freebuf,
+ usalo_havebus,
+ usalo_fileno,
+ usalo_initiator_id,
+ usalo_isatapi,
+ usalo_reset,
};
/*#undef sun*/
@@ -276,77 +276,77 @@
* This does not mean that you may use it, but you can see
* if other problems exist.
*/
-#define scgo_dversion scgo_version
-#define scgo_dhelp scgo_help
-#define scgo_dopen scgo_open
-#define scgo_dclose scgo_close
-#define scgo_dmaxdma scgo_maxdma
-#define scgo_dgetbuf scgo_getbuf
-#define scgo_dfreebuf scgo_freebuf
-#define scgo_dhavebus scgo_havebus
-#define scgo_dfileno scgo_fileno
-#define scgo_dinitiator_id scgo_initiator_id
-#define scgo_disatapi scgo_isatapi
-#define scgo_dreset scgo_reset
-#define scgo_dsend scgo_send
+#define usalo_dversion usalo_version
+#define usalo_dhelp usalo_help
+#define usalo_dopen usalo_open
+#define usalo_dclose usalo_close
+#define usalo_dmaxdma usalo_maxdma
+#define usalo_dgetbuf usalo_getbuf
+#define usalo_dfreebuf usalo_freebuf
+#define usalo_dhavebus usalo_havebus
+#define usalo_dfileno usalo_fileno
+#define usalo_dinitiator_id usalo_initiator_id
+#define usalo_disatapi usalo_isatapi
+#define usalo_dreset usalo_reset
+#define usalo_dsend usalo_send
#endif /* SCSI_IMPL */
-static int scgo_dsend(SCSI *scgp);
-static char *scgo_dversion(SCSI *scgp, int what);
-static int scgo_dhelp(SCSI *scgp, FILE *f);
-static int scgo_nohelp(SCSI *scgp, FILE *f);
-static int scgo_ropen(SCSI *scgp, char *device);
-static int scgo_dopen(SCSI *scgp, char *device);
-static int scgo_dclose(SCSI *scgp);
-static long scgo_dmaxdma(SCSI *scgp, long amt);
-static void *scgo_dgetbuf(SCSI *scgp, long amt);
-static void scgo_dfreebuf(SCSI *scgp);
-static BOOL scgo_dhavebus(SCSI *scgp, int busno);
-static int scgo_dfileno(SCSI *scgp, int busno, int tgt, int tlun);
-static int scgo_dinitiator_id(SCSI *scgp);
-static int scgo_disatapi(SCSI *scgp);
-static int scgo_dreset(SCSI *scgp, int what);
+static int usalo_dsend(SCSI *usalp);
+static char *usalo_dversion(SCSI *usalp, int what);
+static int usalo_dhelp(SCSI *usalp, FILE *f);
+static int usalo_nohelp(SCSI *usalp, FILE *f);
+static int usalo_ropen(SCSI *usalp, char *device);
+static int usalo_dopen(SCSI *usalp, char *device);
+static int usalo_dclose(SCSI *usalp);
+static long usalo_dmaxdma(SCSI *usalp, long amt);
+static void *usalo_dgetbuf(SCSI *usalp, long amt);
+static void usalo_dfreebuf(SCSI *usalp);
+static BOOL usalo_dhavebus(SCSI *usalp, int busno);
+static int usalo_dfileno(SCSI *usalp, int busno, int tgt, int tlun);
+static int usalo_dinitiator_id(SCSI *usalp);
+static int usalo_disatapi(SCSI *usalp);
+static int usalo_dreset(SCSI *usalp, int what);
-scg_ops_t scg_remote_ops = {
- scgo_dsend,
- scgo_dversion,
- scgo_nohelp,
- scgo_ropen,
- scgo_dclose,
- scgo_dmaxdma,
- scgo_dgetbuf,
- scgo_dfreebuf,
- scgo_dhavebus,
- scgo_dfileno,
- scgo_dinitiator_id,
- scgo_disatapi,
- scgo_dreset,
+usal_ops_t usal_remote_ops = {
+ usalo_dsend,
+ usalo_dversion,
+ usalo_nohelp,
+ usalo_ropen,
+ usalo_dclose,
+ usalo_dmaxdma,
+ usalo_dgetbuf,
+ usalo_dfreebuf,
+ usalo_dhavebus,
+ usalo_dfileno,
+ usalo_dinitiator_id,
+ usalo_disatapi,
+ usalo_dreset,
};
-scg_ops_t scg_dummy_ops = {
- scgo_dsend,
- scgo_dversion,
- scgo_dhelp,
- scgo_dopen,
- scgo_dclose,
- scgo_dmaxdma,
- scgo_dgetbuf,
- scgo_dfreebuf,
- scgo_dhavebus,
- scgo_dfileno,
- scgo_dinitiator_id,
- scgo_disatapi,
- scgo_dreset,
+usal_ops_t usal_dummy_ops = {
+ usalo_dsend,
+ usalo_dversion,
+ usalo_dhelp,
+ usalo_dopen,
+ usalo_dclose,
+ usalo_dmaxdma,
+ usalo_dgetbuf,
+ usalo_dfreebuf,
+ usalo_dhavebus,
+ usalo_dfileno,
+ usalo_dinitiator_id,
+ usalo_disatapi,
+ usalo_dreset,
};
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_trans_dversion[] = "scsihack.c-1.44"; /* The version for this transport*/
+static char _usal_trans_dversion[] = "scsihack.c-1.44"; /* The version for this transport*/
/*
* Return version information for the low level SCSI transport code.
@@ -354,19 +354,19 @@
* in applications.
*/
static char *
-scgo_dversion(SCSI *scgp, int what)
+usalo_dversion(SCSI *usalp, int what)
{
- if (scgp != (SCSI *)0) {
+ if (usalp != (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_trans_dversion);
+ return (_usal_trans_dversion);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_cdrkit);
+ return (_usal_auth_cdrkit);
case SCG_SCCS_ID:
return (_sccsid);
}
@@ -375,20 +375,20 @@
}
static int
-scgo_dhelp(SCSI *scgp, FILE *f)
+usalo_dhelp(SCSI *usalp, FILE *f)
{
printf("None.\n");
return (0);
}
static int
-scgo_nohelp(SCSI *scgp, FILE *f)
+usalo_nohelp(SCSI *usalp, FILE *f)
{
return (0);
}
static int
-scgo_ropen(SCSI *scgp, char *device)
+usalo_ropen(SCSI *usalp, char *device)
{
comerrno(EX_BAD, "No remote SCSI transport available.\n");
return (-1); /* Keep lint happy */
@@ -396,14 +396,14 @@
#ifndef SCSI_IMPL
static int
-scgo_dopen(SCSI *scgp, char *device)
+usalo_dopen(SCSI *usalp, char *device)
{
comerrno(EX_BAD, "No local SCSI transport implementation for this architecture.\n");
return (-1); /* Keep lint happy */
}
#else
static int
-scgo_dopen(SCSI *scgp, char *device)
+usalo_dopen(SCSI *usalp, char *device)
{
comerrno(EX_BAD, "SCSI open usage error.\n");
return (-1); /* Keep lint happy */
@@ -411,64 +411,64 @@
#endif /* SCSI_IMPL */
static int
-scgo_dclose(SCSI *scgp)
+usalo_dclose(SCSI *usalp)
{
errno = EINVAL;
return (-1);
}
static long
-scgo_dmaxdma(SCSI *scgp, long amt)
+usalo_dmaxdma(SCSI *usalp, long amt)
{
errno = EINVAL;
return (0L);
}
static void *
-scgo_dgetbuf(SCSI *scgp, long amt)
+usalo_dgetbuf(SCSI *usalp, long amt)
{
errno = EINVAL;
return ((void *)0);
}
static void
-scgo_dfreebuf(SCSI *scgp)
+usalo_dfreebuf(SCSI *usalp)
{
}
static BOOL
-scgo_dhavebus(SCSI *scgp, int busno)
+usalo_dhavebus(SCSI *usalp, int busno)
{
return (FALSE);
}
static int
-scgo_dfileno(SCSI *scgp, int busno, int tgt, int tlun)
+usalo_dfileno(SCSI *usalp, int busno, int tgt, int tlun)
{
return (-1);
}
static int
-scgo_dinitiator_id(SCSI *scgp)
+usalo_dinitiator_id(SCSI *usalp)
{
return (-1);
}
static int
-scgo_disatapi(SCSI *scgp)
+usalo_disatapi(SCSI *usalp)
{
return (FALSE);
}
static int
-scgo_dreset(SCSI *scgp, int what)
+usalo_dreset(SCSI *usalp, int what)
{
errno = EINVAL;
return (-1);
}
static int
-scgo_dsend(SCSI *scgp)
+usalo_dsend(SCSI *usalp)
{
errno = EINVAL;
return (-1);
Modified: cdrkit/trunk/libusal/scsihelp.c
===================================================================
--- cdrkit/trunk/libscg/scsihelp.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsihelp.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -16,7 +16,7 @@
"@(#)scsihelp.c 1.4 04/01/14 Copyright 2002 J. Schilling";
#endif
/*
- * scg Library
+ * usal Library
* Help subsystem
*
* Copyright (c) 2002 J. Schilling
@@ -41,13 +41,13 @@
#include <standard.h>
#include <schily.h>
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
-void __scg_help(FILE *f, char *name, char *tcomment, char *tind, char *tspec,
+void __usal_help(FILE *f, char *name, char *tcomment, char *tind, char *tspec,
char *texample, BOOL mayscan, BOOL bydev);
void
-__scg_help(FILE *f, char *name, char *tcomment, char *tind, char *tspec,
+__usal_help(FILE *f, char *name, char *tcomment, char *tind, char *tspec,
char *texample, BOOL mayscan, BOOL bydev)
{
fprintf(f, "\nTransport name: %s\n", name);
Modified: cdrkit/trunk/libusal/scsiopen.c
===================================================================
--- cdrkit/trunk/libscg/scsiopen.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsiopen.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -44,8 +44,8 @@
* SCG_CMD_RETRY flag enabled.
*
* Note that the only legal place to assign
- * values to scg_scsibus() scg_target() and scg_lun()
- * is scg_settarget().
+ * values to usal_scsibus() usal_target() and usal_lun()
+ * is usal_settarget().
*/
#include <mconfig.h>
@@ -62,10 +62,10 @@
#include <btorder.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsidefs.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsidefs.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#if defined(linux) || defined(__linux) || defined(__linux__)
#include <sys/utsname.h>
@@ -76,16 +76,16 @@
extern int lverbose;
-SCSI *scg_open(char *scsidev, char *errs, int slen, int debug, int be_verbose);
-int scg_help(FILE *f);
-static int scg_scandev(char *devp, char *errs, int slen, int *busp,
+SCSI *usal_open(char *scsidev, char *errs, int slen, int debug, int be_verbose);
+int usal_help(FILE *f);
+static int usal_scandev(char *devp, char *errs, int slen, int *busp,
int *tgtp, int *lunp);
-int scg_close(SCSI * scgp);
+int usal_close(SCSI * usalp);
-void scg_settimeout(SCSI * scgp, int timeout);
+void usal_settimeout(SCSI * usalp, int timeout);
-SCSI *scg_smalloc(void);
-void scg_sfree(SCSI *scgp);
+SCSI *usal_smalloc(void);
+void usal_sfree(SCSI *usalp);
/*
* Open a SCSI device.
@@ -107,7 +107,7 @@
* specified on command line.
*/
SCSI *
-scg_open(char *scsidev, char *errs, int slen, int debug, int be_verbose)
+usal_open(char *scsidev, char *errs, int slen, int debug, int be_verbose)
{
char devname[256];
char *devp = NULL;
@@ -117,18 +117,18 @@
int tgt = 0;
int lun = 0;
int n = 0;
- SCSI *scgp;
+ SCSI *usalp;
if (errs)
errs[0] = '\0';
- scgp = scg_smalloc();
- if (scgp == NULL) {
+ usalp = usal_smalloc();
+ if (usalp == NULL) {
if (errs)
js_snprintf(errs, slen, "No memory for SCSI structure");
return ((SCSI *)0);
}
- scgp->debug = debug;
- scgp->overbose = be_verbose;
+ usalp->debug = debug;
+ usalp->overbose = be_verbose;
#ifdef __linux__
struct utsname buf;
@@ -192,7 +192,7 @@
if ((devp = strchr(sdev, ':')) == NULL) {
if (strchr(sdev, ',') == NULL) {
/* Notation form: 'devname' (undocumented) */
- /* Forward complete name to scg__open() */
+ /* Forward complete name to usal__open() */
/* Fetch bus/tgt/lun values from OS */
/* We may come here too with 'USCSI' */
n = -1;
@@ -237,13 +237,13 @@
n = -1;
/*
* Got device:@ or device:@,lun
- * Make sure not to call scg_scandev()
+ * Make sure not to call usal_scandev()
*/
devp = NULL;
} else if (devp[0] == '\0') {
/*
* Got USCSI: or ATAPI:
- * Make sure not to call scg_scandev()
+ * Make sure not to call usal_scandev()
*/
devp = NULL;
} else if (strchr(sdev, ',') == NULL) {
@@ -254,7 +254,7 @@
n = -1;
lun = -2; /* Lun must be known */
/*
- * Make sure not to call scg_scandev()
+ * Make sure not to call usal_scandev()
*/
devp = NULL;
}
@@ -265,59 +265,59 @@
/*fprintf(stderr, "10 scsidev '%s' sdev '%s' devp '%s' b: %d t: %d l: %d\n", scsidev, sdev, devp, bus, tgt, lun);*/
if (devp != NULL) {
- n = scg_scandev(devp, errs, slen, &bus, &tgt, &lun);
+ n = usal_scandev(devp, errs, slen, &bus, &tgt, &lun);
if (n < 0) {
errno = EINVAL;
return ((SCSI *)0);
}
}
if (n >= 1 && n <= 3) { /* Got bus,target,lun or target,lun or tgt*/
- scg_settarget(scgp, bus, tgt, lun);
+ usal_settarget(usalp, bus, tgt, lun);
} else if (n == -1) { /* Got device:@, fetch bus/lun from OS */
- scg_settarget(scgp, -2, -2, lun);
+ usal_settarget(usalp, -2, -2, lun);
} else if (devp != NULL) {
/*
* XXX May this happen after we allow tgt to repesent tgt,0 ?
*/
js_fprintf(stderr, "WARNING: device not valid, trying to use default target...\n");
- scg_settarget(scgp, 0, 6, 0);
+ usal_settarget(usalp, 0, 6, 0);
}
if (be_verbose && scsidev != NULL) {
js_fprintf(stderr, "scsidev: '%s'\n", scsidev);
if (devname[0] != '\0')
js_fprintf(stderr, "devname: '%s'\n", devname);
js_fprintf(stderr, "scsibus: %d target: %d lun: %d\n",
- scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
+ usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
}
if (debug > 0) {
- js_fprintf(stderr, "scg__open(%s) %d,%d,%d\n",
+ js_fprintf(stderr, "usal__open(%s) %d,%d,%d\n",
devname,
- scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
+ usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
}
- if (scg__open(scgp, devname) <= 0) {
- if (errs && scgp->errstr)
- js_snprintf(errs, slen, "%s", scgp->errstr);
- scg_sfree(scgp);
+ if (usal__open(usalp, devname) <= 0) {
+ if (errs && usalp->errstr)
+ js_snprintf(errs, slen, "%s", usalp->errstr);
+ usal_sfree(usalp);
return ((SCSI *)0);
}
- return (scgp);
+ return (usalp);
}
int
-scg_help(FILE *f)
+usal_help(FILE *f)
{
- SCSI *scgp;
+ SCSI *usalp;
- scgp = scg_smalloc();
- if (scgp != NULL) {
-extern scg_ops_t scg_std_ops;
+ usalp = usal_smalloc();
+ if (usalp != NULL) {
+extern usal_ops_t usal_std_ops;
- scgp->ops = &scg_std_ops;
+ usalp->ops = &usal_std_ops;
printf("Supported SCSI transports for this platform:\n");
- SCGO_HELP(scgp, f);
- scg_remote()->scgo_help(scgp, f);
- scg_sfree(scgp);
+ SCGO_HELP(usalp, f);
+ usal_remote()->usalo_help(usalp, f);
+ usal_sfree(usalp);
}
return (0);
}
@@ -328,7 +328,7 @@
* This is definitely better than using scanf() as it checks for syntax errors.
*/
static int
-scg_scandev(char *devp, char *errs, int slen, int *busp, int *tgtp, int *lunp)
+usal_scandev(char *devp, char *errs, int slen, int *busp, int *tgtp, int *lunp)
{
int x1, x2, x3;
int n = 0;
@@ -393,86 +393,86 @@
}
int
-scg_close(SCSI *scgp)
+usal_close(SCSI *usalp)
{
- scg__close(scgp);
- scg_sfree(scgp);
+ usal__close(usalp);
+ usal_sfree(usalp);
return (0);
}
void
-scg_settimeout(SCSI *scgp, int timeout)
+usal_settimeout(SCSI *usalp, int timeout)
{
#ifdef nonono
if (timeout >= 0)
- scgp->deftimeout = timeout;
+ usalp->deftimeout = timeout;
#else
- scgp->deftimeout = timeout;
+ usalp->deftimeout = timeout;
#endif
}
SCSI *
-scg_smalloc()
+usal_smalloc()
{
- SCSI *scgp;
-extern scg_ops_t scg_dummy_ops;
+ SCSI *usalp;
+extern usal_ops_t usal_dummy_ops;
- scgp = (SCSI *)malloc(sizeof (*scgp));
- if (scgp == NULL)
+ usalp = (SCSI *)malloc(sizeof (*usalp));
+ if (usalp == NULL)
return ((SCSI *)0);
- fillbytes(scgp, sizeof (*scgp), 0);
- scgp->ops = &scg_dummy_ops;
- scg_settarget(scgp, -1, -1, -1);
- scgp->fd = -1;
- scgp->deftimeout = 20;
- scgp->running = FALSE;
+ fillbytes(usalp, sizeof (*usalp), 0);
+ usalp->ops = &usal_dummy_ops;
+ usal_settarget(usalp, -1, -1, -1);
+ usalp->fd = -1;
+ usalp->deftimeout = 20;
+ usalp->running = FALSE;
- scgp->cmdstart = (struct timeval *)malloc(sizeof (struct timeval));
- if (scgp->cmdstart == NULL)
+ usalp->cmdstart = (struct timeval *)malloc(sizeof (struct timeval));
+ if (usalp->cmdstart == NULL)
goto err;
- scgp->cmdstop = (struct timeval *)malloc(sizeof (struct timeval));
- if (scgp->cmdstop == NULL)
+ usalp->cmdstop = (struct timeval *)malloc(sizeof (struct timeval));
+ if (usalp->cmdstop == NULL)
goto err;
- scgp->scmd = (struct scg_cmd *)malloc(sizeof (struct scg_cmd));
- if (scgp->scmd == NULL)
+ usalp->scmd = (struct usal_cmd *)malloc(sizeof (struct usal_cmd));
+ if (usalp->scmd == NULL)
goto err;
- scgp->errstr = malloc(SCSI_ERRSTR_SIZE);
- if (scgp->errstr == NULL)
+ usalp->errstr = malloc(SCSI_ERRSTR_SIZE);
+ if (usalp->errstr == NULL)
goto err;
- scgp->errptr = scgp->errbeg = scgp->errstr;
- scgp->errstr[0] = '\0';
- scgp->errfile = (void *)stderr;
- scgp->inq = (struct scsi_inquiry *)malloc(sizeof (struct scsi_inquiry));
- if (scgp->inq == NULL)
+ usalp->errptr = usalp->errbeg = usalp->errstr;
+ usalp->errstr[0] = '\0';
+ usalp->errfile = (void *)stderr;
+ usalp->inq = (struct scsi_inquiry *)malloc(sizeof (struct scsi_inquiry));
+ if (usalp->inq == NULL)
goto err;
- scgp->cap = (struct scsi_capacity *)malloc(sizeof (struct scsi_capacity));
- if (scgp->cap == NULL)
+ usalp->cap = (struct scsi_capacity *)malloc(sizeof (struct scsi_capacity));
+ if (usalp->cap == NULL)
goto err;
- return (scgp);
+ return (usalp);
err:
- scg_sfree(scgp);
+ usal_sfree(usalp);
return ((SCSI *)0);
}
void
-scg_sfree(SCSI *scgp)
+usal_sfree(SCSI *usalp)
{
- if (scgp->cmdstart)
- free(scgp->cmdstart);
- if (scgp->cmdstop)
- free(scgp->cmdstop);
- if (scgp->scmd)
- free(scgp->scmd);
- if (scgp->inq)
- free(scgp->inq);
- if (scgp->cap)
- free(scgp->cap);
- if (scgp->local)
- free(scgp->local);
- scg_freebuf(scgp);
- if (scgp->errstr)
- free(scgp->errstr);
- free(scgp);
+ if (usalp->cmdstart)
+ free(usalp->cmdstart);
+ if (usalp->cmdstop)
+ free(usalp->cmdstop);
+ if (usalp->scmd)
+ free(usalp->scmd);
+ if (usalp->inq)
+ free(usalp->inq);
+ if (usalp->cap)
+ free(usalp->cap);
+ if (usalp->local)
+ free(usalp->local);
+ usal_freebuf(usalp);
+ if (usalp->errstr)
+ free(usalp->errstr);
+ free(usalp);
}
Modified: cdrkit/trunk/libusal/scsitransp.c
===================================================================
--- cdrkit/trunk/libscg/scsitransp.c 2006-11-23 11:16:23 UTC (rev 427)
+++ cdrkit/trunk/libusal/scsitransp.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -19,7 +19,7 @@
* SCSI user level command transport routines (generic part).
*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
@@ -51,140 +51,140 @@
#include <strdefs.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
-#include "scgtimes.h"
+#include <usal/usalcmd.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
+#include "usaltimes.h"
/*
* Warning: you may change this source, but if you do that
- * you need to change the _scg_version and _scg_auth* string below.
+ * you need to change the _usal_version and _usal_auth* string below.
* You may not return "schily" for an SCG_AUTHOR request anymore.
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
-static char _scg_version[] = "0.8ubuntu1+debburn1"; /* The global libscg version */
-static char _scg_auth_ubuntu[] = "debburn project"; /* The author for this module */
+static char _usal_version[] = "0.8ubuntu1+debburn1"; /* The global libusal version */
+static char _usal_auth_ubuntu[] = "debburn project"; /* The author for this module */
#define DEFTIMEOUT 20 /* Default timeout for SCSI command transport */
-char *scg_version(SCSI *scgp, int what);
-int scg__open(SCSI *scgp, char *device);
-int scg__close(SCSI *scgp);
-BOOL scg_havebus(SCSI *scgp, int);
-int scg_initiator_id(SCSI *scgp);
-int scg_isatapi(SCSI *scgp);
-int scg_reset(SCSI *scgp, int what);
-void *scg_getbuf(SCSI *scgp, long);
-void scg_freebuf(SCSI *scgp);
-long scg_bufsize(SCSI *scgp, long);
-void scg_setnonstderrs(SCSI *scgp, const char **);
-BOOL scg_yes(char *);
+char *usal_version(SCSI *usalp, int what);
+int usal__open(SCSI *usalp, char *device);
+int usal__close(SCSI *usalp);
+BOOL usal_havebus(SCSI *usalp, int);
+int usal_initiator_id(SCSI *usalp);
+int usal_isatapi(SCSI *usalp);
+int usal_reset(SCSI *usalp, int what);
+void *usal_getbuf(SCSI *usalp, long);
+void usal_freebuf(SCSI *usalp);
+long usal_bufsize(SCSI *usalp, long);
+void usal_setnonstderrs(SCSI *usalp, const char **);
+BOOL usal_yes(char *);
#ifdef nonono
-static void scg_sighandler(int);
+static void usal_sighandler(int);
#endif
-int scg_cmd(SCSI *scgp);
-void scg_vhead(SCSI *scgp);
-int scg_svhead(SCSI *scgp, char *buf, int maxcnt);
-int scg_vtail(SCSI *scgp);
-int scg_svtail(SCSI *scgp, int *retp, char *buf, int maxcnt);
-void scg_vsetup(SCSI *scgp);
-int scg_getresid(SCSI *scgp);
-int scg_getdmacnt(SCSI *scgp);
-BOOL scg_cmd_err(SCSI *scgp);
-void scg_printerr(SCSI *scgp);
-void scg_fprinterr(SCSI *scgp, FILE *f);
-int scg_sprinterr(SCSI *scgp, char *buf, int maxcnt);
-int scg__sprinterr(SCSI *scgp, char *buf, int maxcnt);
-void scg_printcdb(SCSI *scgp);
-int scg_sprintcdb(SCSI *scgp, char *buf, int maxcnt);
-void scg_printwdata(SCSI *scgp);
-int scg_sprintwdata(SCSI *scgp, char *buf, int maxcnt);
-void scg_printrdata(SCSI *scgp);
-int scg_sprintrdata(SCSI *scgp, char *buf, int maxcnt);
-void scg_printresult(SCSI *scgp);
-int scg_sprintresult(SCSI *scgp, char *buf, int maxcnt);
-void scg_printstatus(SCSI *scgp);
-int scg_sprintstatus(SCSI *scgp, char *buf, int maxcnt);
-void scg_fprbytes(FILE *, char *, unsigned char *, int);
-void scg_fprascii(FILE *, char *, unsigned char *, int);
-void scg_prbytes(char *, unsigned char *, int);
-void scg_prascii(char *, unsigned char *, int);
-int scg_sprbytes(char *buf, int maxcnt, char *, unsigned char *, int);
-int scg_sprascii(char *buf, int maxcnt, char *, unsigned char *, int);
-void scg_fprsense(FILE *f, unsigned char *, int);
-int scg_sprsense(char *buf, int maxcnt, unsigned char *, int);
-void scg_prsense(unsigned char *, int);
-int scg_cmd_status(SCSI *scgp);
-int scg_sense_key(SCSI *scgp);
-int scg_sense_code(SCSI *scgp);
-int scg_sense_qual(SCSI *scgp);
-unsigned char *scg_sense_table(SCSI *scgp);
-void scg_fprintdev(FILE *, struct scsi_inquiry *);
-void scg_printdev(struct scsi_inquiry *);
-int scg_printf(SCSI *scgp, const char *form, ...);
-int scg_errflush(SCSI *scgp);
-int scg_errfflush(SCSI *scgp, FILE *f);
+int usal_cmd(SCSI *usalp);
+void usal_vhead(SCSI *usalp);
+int usal_svhead(SCSI *usalp, char *buf, int maxcnt);
+int usal_vtail(SCSI *usalp);
+int usal_svtail(SCSI *usalp, int *retp, char *buf, int maxcnt);
+void usal_vsetup(SCSI *usalp);
+int usal_getresid(SCSI *usalp);
+int usal_getdmacnt(SCSI *usalp);
+BOOL usal_cmd_err(SCSI *usalp);
+void usal_printerr(SCSI *usalp);
+void usal_fprinterr(SCSI *usalp, FILE *f);
+int usal_sprinterr(SCSI *usalp, char *buf, int maxcnt);
+int usal__sprinterr(SCSI *usalp, char *buf, int maxcnt);
+void usal_printcdb(SCSI *usalp);
+int usal_sprintcdb(SCSI *usalp, char *buf, int maxcnt);
+void usal_printwdata(SCSI *usalp);
+int usal_sprintwdata(SCSI *usalp, char *buf, int maxcnt);
+void usal_printrdata(SCSI *usalp);
+int usal_sprintrdata(SCSI *usalp, char *buf, int maxcnt);
+void usal_printresult(SCSI *usalp);
+int usal_sprintresult(SCSI *usalp, char *buf, int maxcnt);
+void usal_printstatus(SCSI *usalp);
+int usal_sprintstatus(SCSI *usalp, char *buf, int maxcnt);
+void usal_fprbytes(FILE *, char *, unsigned char *, int);
+void usal_fprascii(FILE *, char *, unsigned char *, int);
+void usal_prbytes(char *, unsigned char *, int);
+void usal_prascii(char *, unsigned char *, int);
+int usal_sprbytes(char *buf, int maxcnt, char *, unsigned char *, int);
+int usal_sprascii(char *buf, int maxcnt, char *, unsigned char *, int);
+void usal_fprsense(FILE *f, unsigned char *, int);
+int usal_sprsense(char *buf, int maxcnt, unsigned char *, int);
+void usal_prsense(unsigned char *, int);
+int usal_cmd_status(SCSI *usalp);
+int usal_sense_key(SCSI *usalp);
+int usal_sense_code(SCSI *usalp);
+int usal_sense_qual(SCSI *usalp);
+unsigned char *usal_sense_table(SCSI *usalp);
+void usal_fprintdev(FILE *, struct scsi_inquiry *);
+void usal_printdev(struct scsi_inquiry *);
+int usal_printf(SCSI *usalp, const char *form, ...);
+int usal_errflush(SCSI *usalp);
+int usal_errfflush(SCSI *usalp, FILE *f);
/*
* Return version information for the SCSI transport code.
* This has been introduced to make it easier to trace down problems
* in applications.
*
- * If scgp is NULL, return general library version information.
- * If scgp is != NULL, return version information for the low level transport.
+ * If usalp is NULL, return general library version information.
+ * If usalp is != NULL, return version information for the low level transport.
*/
char *
-scg_version(SCSI *scgp, int what)
+usal_version(SCSI *usalp, int what)
{
- if (scgp == (SCSI *)0) {
+ if (usalp == (SCSI *)0) {
switch (what) {
case SCG_VERSION:
- return (_scg_version);
+ return (_usal_version);
/*
* If you changed this source, you are not allowed to
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
- return (_scg_auth_ubuntu);
+ return (_usal_auth_ubuntu);
case SCG_SCCS_ID:
return (sccsid);
default:
return ((char *)0);
}
}
- return (SCGO_VERSION(scgp, what));
+ return (SCGO_VERSION(usalp, what));
}
/*
* Call low level SCSI open routine from transport abstraction layer.
*/
int
-scg__open(SCSI *scgp, char *device)
+usal__open(SCSI *usalp, char *device)
{
int ret;
- scg_ops_t *ops;
-extern scg_ops_t scg_std_ops;
+ usal_ops_t *ops;
+extern usal_ops_t usal_std_ops;
- scgp->ops = &scg_std_ops;
+ usalp->ops = &usal_std_ops;
if (device && strncmp(device, "REMOTE", 6) == 0) {
- ops = scg_remote();
+ ops = usal_remote();
if (ops != NULL)
- scgp->ops = ops;
+ usalp->ops = ops;
}
- ret = SCGO_OPEN(scgp, device);
+ ret = SCGO_OPEN(usalp, device);
if (ret < 0)
return (ret);
/*
- * Now make scgp->fd valid if possible.
- * Note that scg_scsibus(scgp)/scg_target(scgp)/scg_lun(scgp) may have
+ * Now make usalp->fd valid if possible.
+ * Note that usal_scsibus(usalp)/usal_target(usalp)/usal_lun(usalp) may have
* changed in SCGO_OPEN().
*/
- scg_settarget(scgp, scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
+ usal_settarget(usalp, usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
return (ret);
}
@@ -192,25 +192,25 @@
* Call low level SCSI close routine from transport abstraction layer.
*/
int
-scg__close(SCSI *scgp)
+usal__close(SCSI *usalp)
{
- return (SCGO_CLOSE(scgp));
+ return (SCGO_CLOSE(usalp));
}
/*
* Retrieve max DMA count for this target.
*/
long
-scg_bufsize(SCSI *scgp, long amt)
+usal_bufsize(SCSI *usalp, long amt)
{
long maxdma;
- maxdma = SCGO_MAXDMA(scgp, amt);
+ maxdma = SCGO_MAXDMA(usalp, amt);
if (amt <= 0 || amt > maxdma)
amt = maxdma;
- scgp->maxdma = maxdma; /* Max possible */
- scgp->maxbuf = amt; /* Current value */
+ usalp->maxdma = maxdma; /* Max possible */
+ usalp->maxbuf = amt; /* Current value */
return (amt);
}
@@ -219,15 +219,15 @@
* Allocate a buffer that may be used for DMA.
*/
void *
-scg_getbuf(SCSI *scgp, long amt)
+usal_getbuf(SCSI *usalp, long amt)
{
void *buf;
- if (amt <= 0 || amt > scg_bufsize(scgp, amt))
+ if (amt <= 0 || amt > usal_bufsize(usalp, amt))
return ((void *)0);
- buf = SCGO_GETBUF(scgp, amt);
- scgp->bufptr = buf;
+ buf = SCGO_GETBUF(usalp, amt);
+ usalp->bufptr = buf;
return (buf);
}
@@ -235,64 +235,64 @@
* Free DMA buffer.
*/
void
-scg_freebuf(SCSI *scgp)
+usal_freebuf(SCSI *usalp)
{
- SCGO_FREEBUF(scgp);
- scgp->bufptr = NULL;
+ SCGO_FREEBUF(usalp);
+ usalp->bufptr = NULL;
}
/*
* Check if 'busno' is a valid SCSI bus number.
*/
BOOL
-scg_havebus(SCSI *scgp, int busno)
+usal_havebus(SCSI *usalp, int busno)
{
- return (SCGO_HAVEBUS(scgp, busno));
+ return (SCGO_HAVEBUS(usalp, busno));
}
/*
* Return SCSI initiator ID for current SCSI bus if available.
*/
int
-scg_initiator_id(SCSI *scgp)
+usal_initiator_id(SCSI *usalp)
{
- return (SCGO_INITIATOR_ID(scgp));
+ return (SCGO_INITIATOR_ID(usalp));
}
/*
* Return a hint whether current SCSI target refers to a ATAPI device.
*/
int
-scg_isatapi(SCSI *scgp)
+usal_isatapi(SCSI *usalp)
{
- return (SCGO_ISATAPI(scgp));
+ return (SCGO_ISATAPI(usalp));
}
/*
* Reset SCSI bus or target.
*/
int
-scg_reset(SCSI *scgp, int what)
+usal_reset(SCSI *usalp, int what)
{
- return (SCGO_RESET(scgp, what));
+ return (SCGO_RESET(usalp, what));
}
/*
* Set up nonstd error vector for curren target.
- * To clear additional error table, call scg_setnonstderrs(scgp, NULL);
+ * To clear additional error table, call usal_setnonstderrs(usalp, NULL);
* Note: do not use this when scanning the SCSI bus.
*/
void
-scg_setnonstderrs(SCSI *scgp, const char **vec)
+usal_setnonstderrs(SCSI *usalp, const char **vec)
{
- scgp->nonstderrs = vec;
+ usalp->nonstderrs = vec;
}
/*
* Simple Yes/No answer checker.
*/
BOOL
-scg_yes(char *msg)
+usal_yes(char *msg)
{
char okbuf[10];
@@ -309,16 +309,16 @@
#ifdef nonono
static void
-scg_sighandler(int sig)
+usal_sighandler(int sig)
{
js_printf("\n");
if (scsi_running) {
js_printf("Running command: %s\n", scsi_command);
js_printf("Resetting SCSI - Bus.\n");
- if (scg_reset(scgp) < 0)
+ if (usal_reset(usalp) < 0)
errmsg("Cannot reset SCSI - Bus.\n");
}
- if (scg_yes("EXIT ? "))
+ if (usal_yes("EXIT ? "))
exit(sig);
}
#endif
@@ -326,25 +326,25 @@
/*
* Send a SCSI command.
* Do error checking and reporting depending on the values of
- * scgp->verbose, scgp->debug and scgp->silent.
+ * usalp->verbose, usalp->debug and usalp->silent.
*/
int
-scg_cmd(SCSI *scgp)
+usal_cmd(SCSI *usalp)
{
int ret;
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
/*
- * Reset old error messages in scgp->errstr
+ * Reset old error messages in usalp->errstr
*/
- scgp->errptr = scgp->errbeg = scgp->errstr;
+ usalp->errptr = usalp->errbeg = usalp->errstr;
- scmd->kdebug = scgp->kdebug;
- if (scmd->timeout == 0 || scmd->timeout < scgp->deftimeout)
- scmd->timeout = scgp->deftimeout;
- if (scgp->disre_disable)
+ scmd->kdebug = usalp->kdebug;
+ if (scmd->timeout == 0 || scmd->timeout < usalp->deftimeout)
+ scmd->timeout = usalp->deftimeout;
+ if (usalp->disre_disable)
scmd->flags &= ~SCG_DISRE_ENA;
- if (scgp->noparity)
+ if (usalp->noparity)
scmd->flags |= SCG_NOPARITY;
scmd->u_sense.cmd_sense[0] = 0; /* Paranioa */
@@ -353,46 +353,46 @@
else if (scmd->sense_len < 0)
scmd->sense_len = 0;
- if (scgp->verbose) {
- scg_vhead(scgp);
- scg_errflush(scgp);
+ if (usalp->verbose) {
+ usal_vhead(usalp);
+ usal_errflush(usalp);
}
- if (scgp->running) {
- if (scgp->curcmdname) {
+ if (usalp->running) {
+ if (usalp->curcmdname) {
fprintf(stderr, "Currently running '%s' command.\n",
- scgp->curcmdname);
+ usalp->curcmdname);
}
raisecond("SCSI ALREADY RUNNING !!", 0L);
}
- scgp->cb_fun = NULL;
- gettimeofday(scgp->cmdstart, (struct timezone *)0);
- scgp->curcmdname = scgp->cmdname;
- scgp->running = TRUE;
- ret = SCGO_SEND(scgp);
- scgp->running = FALSE;
- __scg_times(scgp);
+ usalp->cb_fun = NULL;
+ gettimeofday(usalp->cmdstart, (struct timezone *)0);
+ usalp->curcmdname = usalp->cmdname;
+ usalp->running = TRUE;
+ ret = SCGO_SEND(usalp);
+ usalp->running = FALSE;
+ __usal_times(usalp);
if (ret < 0) {
/*
- * Old /dev/scg versions will not allow to access targets > 7.
+ * Old /dev/usal versions will not allow to access targets > 7.
* Include a workaround to make this non fatal.
*/
- if (scg_target(scgp) < 8 || geterrno() != EINVAL)
+ if (usal_target(usalp) < 8 || geterrno() != EINVAL)
comerr("Cannot send SCSI cmd via ioctl\n");
if (scmd->ux_errno == 0)
scmd->ux_errno = geterrno();
if (scmd->error == SCG_NO_ERROR)
scmd->error = SCG_FATAL;
- if (scgp->debug > 0) {
+ if (usalp->debug > 0) {
errmsg("ret < 0 errno: %d ux_errno: %d error: %d\n",
geterrno(), scmd->ux_errno, scmd->error);
}
}
- ret = scg_vtail(scgp);
- scg_errflush(scgp);
- if (scgp->cb_fun != NULL)
- (*scgp->cb_fun)(scgp->cb_arg);
+ ret = usal_vtail(usalp);
+ usal_errflush(usalp);
+ if (usalp->cb_fun != NULL)
+ (*usalp->cb_fun)(usalp->cb_arg);
return (ret);
}
@@ -401,9 +401,9 @@
* Action depends on SCSI verbose status.
*/
void
-scg_vhead(SCSI *scgp)
+usal_vhead(SCSI *usalp)
{
- scgp->errptr += scg_svhead(scgp, scgp->errptr, scg_errrsize(scgp));
+ usalp->errptr += usal_svhead(usalp, usalp->errptr, usal_errrsize(usalp));
}
/*
@@ -411,33 +411,33 @@
* Action depends on SCSI verbose status.
*/
int
-scg_svhead(SCSI *scgp, char *buf, int maxcnt)
+usal_svhead(SCSI *usalp, char *buf, int maxcnt)
{
register char *p = buf;
register int amt;
- if (scgp->verbose <= 0)
+ if (usalp->verbose <= 0)
return (0);
amt = js_snprintf(p, maxcnt,
"\nExecuting '%s' command on Bus %d Target %d, Lun %d timeout %ds\n",
/* XXX Really this ??? */
-/* scgp->cmdname, scg_scsibus(scgp), scg_target(scgp), scgp->scmd->cdb.g0_cdb.lun,*/
- scgp->cmdname, scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp),
- scgp->scmd->timeout);
+/* usalp->cmdname, usal_scsibus(usalp), usal_target(usalp), usalp->scmd->cdb.g0_cdb.lun,*/
+ usalp->cmdname, usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp),
+ usalp->scmd->timeout);
if (amt < 0)
return (amt);
p += amt;
maxcnt -= amt;
- amt = scg_sprintcdb(scgp, p, maxcnt);
+ amt = usal_sprintcdb(usalp, p, maxcnt);
if (amt < 0)
return (amt);
p += amt;
maxcnt -= amt;
- if (scgp->verbose > 1) {
- amt = scg_sprintwdata(scgp, p, maxcnt);
+ if (usalp->verbose > 1) {
+ amt = usal_sprintwdata(usalp, p, maxcnt);
if (amt < 0)
return (amt);
p += amt;
@@ -451,11 +451,11 @@
* Action depends on SCSI verbose status.
*/
int
-scg_vtail(SCSI *scgp)
+usal_vtail(SCSI *usalp)
{
int ret;
- scgp->errptr += scg_svtail(scgp, &ret, scgp->errptr, scg_errrsize(scgp));
+ usalp->errptr += usal_svtail(usalp, &ret, usalp->errptr, usal_errrsize(usalp));
return (ret);
}
@@ -464,26 +464,26 @@
* Action depends on SCSI verbose status.
*/
int
-scg_svtail(SCSI *scgp, int *retp, char *buf, int maxcnt)
+usal_svtail(SCSI *usalp, int *retp, char *buf, int maxcnt)
{
register char *p = buf;
register int amt;
int ret;
- ret = scg_cmd_err(scgp) ? -1 : 0;
+ ret = usal_cmd_err(usalp) ? -1 : 0;
if (retp)
*retp = ret;
if (ret) {
- if (scgp->silent <= 0 || scgp->verbose) {
- amt = scg__sprinterr(scgp, p, maxcnt);
+ if (usalp->silent <= 0 || usalp->verbose) {
+ amt = usal__sprinterr(usalp, p, maxcnt);
if (amt < 0)
return (amt);
p += amt;
maxcnt -= amt;
}
}
- if ((scgp->silent <= 0 || scgp->verbose) && scgp->scmd->resid) {
- if (scgp->scmd->resid < 0) {
+ if ((usalp->silent <= 0 || usalp->verbose) && usalp->scmd->resid) {
+ if (usalp->scmd->resid < 0) {
/*
* An operating system that does DMA the right way
* will not allow DMA overruns - it will stop DMA
@@ -497,14 +497,14 @@
p += amt;
maxcnt -= amt;
}
- amt = js_snprintf(p, maxcnt, "resid: %d\n", scgp->scmd->resid);
+ amt = js_snprintf(p, maxcnt, "resid: %d\n", usalp->scmd->resid);
if (amt < 0)
return (amt);
p += amt;
maxcnt -= amt;
}
- if (scgp->verbose > 0 || (ret < 0 && scgp->silent <= 0)) {
- amt = scg_sprintresult(scgp, p, maxcnt);
+ if (usalp->verbose > 0 || (ret < 0 && usalp->silent <= 0)) {
+ amt = usal_sprintresult(usalp, p, maxcnt);
if (amt < 0)
return (amt);
p += amt;
@@ -518,10 +518,10 @@
* Action depends on SCSI verbose status.
*/
void
-scg_vsetup(SCSI *scgp)
+usal_vsetup(SCSI *usalp)
{
- scg_vhead(scgp);
- scg_vtail(scgp);
+ usal_vhead(usalp);
+ usal_vtail(usalp);
}
/*
@@ -529,18 +529,18 @@
* If this count is < 0, then a DMA overrun occured.
*/
int
-scg_getresid(SCSI *scgp)
+usal_getresid(SCSI *usalp)
{
- return (scgp->scmd->resid);
+ return (usalp->scmd->resid);
}
/*
* Return the actual DMA count for last command.
*/
int
-scg_getdmacnt(SCSI *scgp)
+usal_getdmacnt(SCSI *usalp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
if (scmd->resid < 0)
return (scmd->size);
@@ -552,9 +552,9 @@
* Test if last SCSI command got an error.
*/
BOOL
-scg_cmd_err(SCSI *scgp)
+usal_cmd_err(SCSI *usalp)
{
- register struct scg_cmd *cp = scgp->scmd;
+ register struct usal_cmd *cp = usalp->scmd;
if (cp->error != SCG_NO_ERROR ||
cp->ux_errno != 0 ||
@@ -580,9 +580,9 @@
* to SCSI errfile.
*/
void
-scg_printerr(SCSI *scgp)
+usal_printerr(SCSI *usalp)
{
- scg_fprinterr(scgp, (FILE *)scgp->errfile);
+ usal_fprinterr(usalp, (FILE *)usalp->errfile);
}
/*
@@ -599,12 +599,12 @@
* to a file.
*/
void
-scg_fprinterr(SCSI *scgp, FILE *f)
+usal_fprinterr(SCSI *usalp, FILE *f)
{
char errbuf[SCSI_ERRSTR_SIZE];
int amt;
- amt = scg_sprinterr(scgp, errbuf, sizeof (errbuf));
+ amt = usal_sprinterr(usalp, errbuf, sizeof (errbuf));
if (amt > 0) {
filewrite(f, errbuf, amt);
fflush(f);
@@ -625,17 +625,17 @@
* into a buffer.
*/
int
-scg_sprinterr(SCSI *scgp, char *buf, int maxcnt)
+usal_sprinterr(SCSI *usalp, char *buf, int maxcnt)
{
int amt;
- int osilent = scgp->silent;
- int overbose = scgp->verbose;
+ int osilent = usalp->silent;
+ int overbose = usalp->verbose;
- scgp->silent = 0;
- scgp->verbose = 0;
- amt = scg_svtail(scgp, NULL, buf, maxcnt);
- scgp->silent = osilent;
- scgp->verbose = overbose;
+ usalp->silent = 0;
+ usalp->verbose = 0;
+ amt = usal_svtail(usalp, NULL, buf, maxcnt);
+ usalp->silent = osilent;
+ usalp->verbose = overbose;
return (amt);
}
@@ -651,9 +651,9 @@
* into a buffer.
*/
int
-scg__sprinterr(SCSI *scgp, char *buf, int maxcnt)
+usal__sprinterr(SCSI *usalp, char *buf, int maxcnt)
{
- register struct scg_cmd *cp = scgp->scmd;
+ register struct usal_cmd *cp = usalp->scmd;
register char *err;
char *cmdname = "SCSI command name not set by caller";
char errbuf[64];
@@ -671,8 +671,8 @@
*/
case SCG_TIMEOUT : js_snprintf(errbuf, sizeof (errbuf),
"cmd timeout after %ld.%03ld (%d) s",
- (long)scgp->cmdstop->tv_sec,
- (long)scgp->cmdstop->tv_usec/1000,
+ (long)usalp->cmdstop->tv_sec,
+ (long)usalp->cmdstop->tv_usec/1000,
cp->timeout);
err = errbuf;
break;
@@ -681,22 +681,22 @@
err = errbuf;
}
- if (scgp->cmdname != NULL && scgp->cmdname[0] != '\0')
- cmdname = scgp->cmdname;
+ if (usalp->cmdname != NULL && usalp->cmdname[0] != '\0')
+ cmdname = usalp->cmdname;
amt = serrmsgno(cp->ux_errno, p, maxcnt, "%s: scsi sendcmd: %s\n", cmdname, err);
if (amt < 0)
return (amt);
p += amt;
maxcnt -= amt;
- amt = scg_sprintcdb(scgp, p, maxcnt);
+ amt = usal_sprintcdb(usalp, p, maxcnt);
if (amt < 0)
return (amt);
p += amt;
maxcnt -= amt;
if (cp->error <= SCG_RETRYABLE) {
- amt = scg_sprintstatus(scgp, p, maxcnt);
+ amt = usal_sprintstatus(usalp, p, maxcnt);
if (amt < 0)
return (amt);
p += amt;
@@ -704,12 +704,12 @@
}
if (cp->scb.chk) {
- amt = scg_sprsense(p, maxcnt, (Uchar *)&cp->sense, cp->sense_count);
+ amt = usal_sprsense(p, maxcnt, (Uchar *)&cp->sense, cp->sense_count);
if (amt < 0)
return (amt);
p += amt;
maxcnt -= amt;
- amt = scg__errmsg(scgp, p, maxcnt, &cp->sense, &cp->scb, -1);
+ amt = usal__errmsg(usalp, p, maxcnt, &cp->sense, &cp->scb, -1);
if (amt < 0)
return (amt);
p += amt;
@@ -724,20 +724,20 @@
* print the SCSI Command descriptor block to XXX stderr.
*/
void
-scg_printcdb(SCSI *scgp)
+usal_printcdb(SCSI *usalp)
{
- scg_prbytes("CDB: ", scgp->scmd->cdb.cmd_cdb, scgp->scmd->cdb_len);
+ usal_prbytes("CDB: ", usalp->scmd->cdb.cmd_cdb, usalp->scmd->cdb_len);
}
/*
* print the SCSI Command descriptor block into a buffer.
*/
int
-scg_sprintcdb(SCSI *scgp, char *buf, int maxcnt)
+usal_sprintcdb(SCSI *usalp, char *buf, int maxcnt)
{
int cnt;
- cnt = scg_sprbytes(buf, maxcnt, "CDB: ", scgp->scmd->cdb.cmd_cdb, scgp->scmd->cdb_len);
+ cnt = usal_sprbytes(buf, maxcnt, "CDB: ", usalp->scmd->cdb.cmd_cdb, usalp->scmd->cdb_len);
if (cnt < 0)
cnt = 0;
return (cnt);
@@ -745,20 +745,20 @@
/*
* XXX Do we need this function?
- * XXX scg_printrdata() is used.
- * XXX We need to check if we should write to stderr or better to scg->errfile
+ * XXX usal_printrdata() is used.
+ * XXX We need to check if we should write to stderr or better to usal->errfile
*
* print the SCSI send data to stderr.
*/
void
-scg_printwdata(SCSI *scgp)
+usal_printwdata(SCSI *usalp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
if (scmd->size > 0 && (scmd->flags & SCG_RECV_DATA) == 0) {
js_fprintf(stderr, "Sending %d (0x%X) bytes of data.\n",
scmd->size, scmd->size);
- scg_prbytes("Write Data: ",
+ usal_prbytes("Write Data: ",
(Uchar *)scmd->addr,
scmd->size > 100 ? 100 : scmd->size);
}
@@ -768,9 +768,9 @@
* print the SCSI send data into a buffer.
*/
int
-scg_sprintwdata(SCSI *scgp, char *buf, int maxcnt)
+usal_sprintwdata(SCSI *usalp, char *buf, int maxcnt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
register char *p = buf;
register int amt;
@@ -782,7 +782,7 @@
return (amt);
p += amt;
maxcnt -= amt;
- amt = scg_sprbytes(p, maxcnt, "Write Data: ",
+ amt = usal_sprbytes(p, maxcnt, "Write Data: ",
(Uchar *)scmd->addr,
scmd->size > 100 ? 100 : scmd->size);
if (amt < 0)
@@ -793,21 +793,21 @@
}
/*
- * XXX We need to check if we should write to stderr or better to scg->errfile
+ * XXX We need to check if we should write to stderr or better to usal->errfile
*
* print the SCSI received data to stderr.
*/
void
-scg_printrdata(SCSI *scgp)
+usal_printrdata(SCSI *usalp)
{
- register struct scg_cmd *scmd = scgp->scmd;
- register int trcnt = scg_getdmacnt(scgp);
+ register struct usal_cmd *scmd = usalp->scmd;
+ register int trcnt = usal_getdmacnt(usalp);
if (scmd->size > 0 && (scmd->flags & SCG_RECV_DATA) != 0) {
js_fprintf(stderr, "Got %d (0x%X), expecting %d (0x%X) bytes of data.\n",
trcnt, trcnt,
scmd->size, scmd->size);
- scg_prbytes("Received Data: ",
+ usal_prbytes("Received Data: ",
(Uchar *)scmd->addr,
trcnt > 100 ? 100 : trcnt);
}
@@ -817,12 +817,12 @@
* print the SCSI received data into a buffer.
*/
int
-scg_sprintrdata(SCSI *scgp, char *buf, int maxcnt)
+usal_sprintrdata(SCSI *usalp, char *buf, int maxcnt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
register char *p = buf;
register int amt;
- register int trcnt = scg_getdmacnt(scgp);
+ register int trcnt = usal_getdmacnt(usalp);
if (scmd->size > 0 && (scmd->flags & SCG_RECV_DATA) != 0) {
amt = js_snprintf(p, maxcnt,
@@ -833,7 +833,7 @@
return (amt);
p += amt;
maxcnt -= amt;
- amt = scg_sprbytes(p, maxcnt,
+ amt = usal_sprbytes(p, maxcnt,
"Received Data: ",
(Uchar *)scmd->addr,
trcnt > 100 ? 100 : trcnt);
@@ -845,19 +845,19 @@
}
/*
- * XXX We need to check if we should write to stderr or better to scg->errfile
+ * XXX We need to check if we should write to stderr or better to usal->errfile
*
* print the SCSI timings and (depending on verbose) received data to stderr.
*/
void
-scg_printresult(SCSI *scgp)
+usal_printresult(SCSI *usalp)
{
js_fprintf(stderr, "cmd finished after %ld.%03lds timeout %ds\n",
- (long)scgp->cmdstop->tv_sec,
- (long)scgp->cmdstop->tv_usec/1000,
- scgp->scmd->timeout);
- if (scgp->verbose > 1)
- scg_printrdata(scgp);
+ (long)usalp->cmdstop->tv_sec,
+ (long)usalp->cmdstop->tv_usec/1000,
+ usalp->scmd->timeout);
+ if (usalp->verbose > 1)
+ usal_printrdata(usalp);
flush();
}
@@ -865,22 +865,22 @@
* print the SCSI timings and (depending on verbose) received data into a buffer.
*/
int
-scg_sprintresult(SCSI *scgp, char *buf, int maxcnt)
+usal_sprintresult(SCSI *usalp, char *buf, int maxcnt)
{
register char *p = buf;
register int amt;
amt = js_snprintf(p, maxcnt,
"cmd finished after %ld.%03lds timeout %ds\n",
- (long)scgp->cmdstop->tv_sec,
- (long)scgp->cmdstop->tv_usec/1000,
- scgp->scmd->timeout);
+ (long)usalp->cmdstop->tv_sec,
+ (long)usalp->cmdstop->tv_usec/1000,
+ usalp->scmd->timeout);
if (amt < 0)
return (amt);
p += amt;
maxcnt -= amt;
- if (scgp->verbose > 1) {
- amt = scg_sprintrdata(scgp, p, maxcnt);
+ if (usalp->verbose > 1) {
+ amt = usal_sprintrdata(usalp, p, maxcnt);
if (amt < 0)
return (amt);
p += amt;
@@ -894,15 +894,15 @@
* print the SCSI status byte in human readable form to the SCSI error file.
*/
void
-scg_printstatus(SCSI *scgp)
+usal_printstatus(SCSI *usalp)
{
char errbuf[SCSI_ERRSTR_SIZE];
int amt;
- amt = scg_sprintstatus(scgp, errbuf, sizeof (errbuf));
+ amt = usal_sprintstatus(usalp, errbuf, sizeof (errbuf));
if (amt > 0) {
- filewrite((FILE *)scgp->errfile, errbuf, amt);
- fflush((FILE *)scgp->errfile);
+ filewrite((FILE *)usalp->errfile, errbuf, amt);
+ fflush((FILE *)usalp->errfile);
}
}
@@ -910,9 +910,9 @@
* print the SCSI status byte in human readable form into a buffer.
*/
int
-scg_sprintstatus(SCSI *scgp, char *buf, int maxcnt)
+usal_sprintstatus(SCSI *usalp, char *buf, int maxcnt)
{
- register struct scg_cmd *cp = scgp->scmd;
+ register struct usal_cmd *cp = usalp->scmd;
char *err;
char *err2 = "";
register char *p = buf;
@@ -965,7 +965,7 @@
* print some bytes in hex to a file.
*/
void
-scg_fprbytes(FILE *f, char *s, register Uchar *cp, register int n)
+usal_fprbytes(FILE *f, char *s, register Uchar *cp, register int n)
{
js_fprintf(f, "%s", s);
while (--n >= 0)
@@ -977,7 +977,7 @@
* print some bytes in ascii to a file.
*/
void
-scg_fprascii(FILE *f, char *s, register Uchar *cp, register int n)
+usal_fprascii(FILE *f, char *s, register Uchar *cp, register int n)
{
register int c;
@@ -993,32 +993,32 @@
}
/*
- * XXX We need to check if we should write to stderr or better to scg->errfile
+ * XXX We need to check if we should write to stderr or better to usal->errfile
*
* print some bytes in hex to stderr.
*/
void
-scg_prbytes(char *s, register Uchar *cp, register int n)
+usal_prbytes(char *s, register Uchar *cp, register int n)
{
- scg_fprbytes(stderr, s, cp, n);
+ usal_fprbytes(stderr, s, cp, n);
}
/*
- * XXX We need to check if we should write to stderr or better to scg->errfile
+ * XXX We need to check if we should write to stderr or better to usal->errfile
*
* print some bytes in ascii to stderr.
*/
void
-scg_prascii(char *s, register Uchar *cp, register int n)
+usal_prascii(char *s, register Uchar *cp, register int n)
{
- scg_fprascii(stderr, s, cp, n);
+ usal_fprascii(stderr, s, cp, n);
}
/*
* print some bytes in hex into a buffer.
*/
int
-scg_sprbytes(char *buf, int maxcnt, char *s, register Uchar *cp, register int n)
+usal_sprbytes(char *buf, int maxcnt, char *s, register Uchar *cp, register int n)
{
register char *p = buf;
register int amt;
@@ -1047,7 +1047,7 @@
* print some bytes in ascii into a buffer.
*/
int
-scg_sprascii(char *buf, int maxcnt, char *s, register Uchar *cp, register int n)
+usal_sprascii(char *buf, int maxcnt, char *s, register Uchar *cp, register int n)
{
register char *p = buf;
register int amt;
@@ -1081,38 +1081,38 @@
* print the SCSI sense data for last command in hex to a file.
*/
void
-scg_fprsense(FILE *f, Uchar *cp, int n)
+usal_fprsense(FILE *f, Uchar *cp, int n)
{
- scg_fprbytes(f, "Sense Bytes:", cp, n);
+ usal_fprbytes(f, "Sense Bytes:", cp, n);
}
/*
- * XXX We need to check if we should write to stderr or better to scg->errfile
+ * XXX We need to check if we should write to stderr or better to usal->errfile
*
* print the SCSI sense data for last command in hex to stderr.
*/
void
-scg_prsense(Uchar *cp, int n)
+usal_prsense(Uchar *cp, int n)
{
- scg_fprsense(stderr, cp, n);
+ usal_fprsense(stderr, cp, n);
}
/*
* print the SCSI sense data for last command in hex into a buffer.
*/
int
-scg_sprsense(char *buf, int maxcnt, Uchar *cp, int n)
+usal_sprsense(char *buf, int maxcnt, Uchar *cp, int n)
{
- return (scg_sprbytes(buf, maxcnt, "Sense Bytes:", cp, n));
+ return (usal_sprbytes(buf, maxcnt, "Sense Bytes:", cp, n));
}
/*
* Return the SCSI status byte for last command.
*/
int
-scg_cmd_status(SCSI *scgp)
+usal_cmd_status(SCSI *usalp)
{
- struct scg_cmd *cp = scgp->scmd;
+ struct usal_cmd *cp = usalp->scmd;
int cmdstatus = *(Uchar *)&cp->scb;
return (cmdstatus);
@@ -1122,12 +1122,12 @@
* Return the SCSI sense key for last command.
*/
int
-scg_sense_key(SCSI *scgp)
+usal_sense_key(SCSI *usalp)
{
- register struct scg_cmd *cp = scgp->scmd;
+ register struct usal_cmd *cp = usalp->scmd;
int key = -1;
- if (!scg_cmd_err(scgp))
+ if (!usal_cmd_err(usalp))
return (0);
if (cp->sense.code >= 0x70)
@@ -1139,11 +1139,11 @@
* Return all the SCSI sense table last command.
*/
unsigned char *
-scg_sense_table(SCSI *scgp)
+usal_sense_table(SCSI *usalp)
{
- register struct scg_cmd *cp = scgp->scmd;
+ register struct usal_cmd *cp = usalp->scmd;
- if(!scg_cmd_err(scgp))
+ if(!usal_cmd_err(usalp))
return (0);
if (cp->sense.code >= 0x70)
@@ -1155,12 +1155,12 @@
* Return the SCSI sense code for last command.
*/
int
-scg_sense_code(SCSI *scgp)
+usal_sense_code(SCSI *usalp)
{
- register struct scg_cmd *cp = scgp->scmd;
+ register struct usal_cmd *cp = usalp->scmd;
int code = -1;
- if (!scg_cmd_err(scgp))
+ if (!usal_cmd_err(usalp))
return (0);
if (cp->sense.code >= 0x70)
@@ -1174,11 +1174,11 @@
* Return the SCSI sense qualifier for last command.
*/
int
-scg_sense_qual(SCSI *scgp)
+usal_sense_qual(SCSI *usalp)
{
- register struct scg_cmd *cp = scgp->scmd;
+ register struct usal_cmd *cp = usalp->scmd;
- if (!scg_cmd_err(scgp))
+ if (!usal_cmd_err(usalp))
return (0);
if (cp->sense.code >= 0x70)
@@ -1191,7 +1191,7 @@
* Print the device type from the SCSI inquiry buffer to file.
*/
void
-scg_fprintdev(FILE *f, struct scsi_inquiry *ip)
+usal_fprintdev(FILE *f, struct scsi_inquiry *ip)
{
if (ip->removable)
js_fprintf(f, "Removable ");
@@ -1279,9 +1279,9 @@
* Print the device type from the SCSI inquiry buffer to stdout.
*/
void
-scg_printdev(struct scsi_inquiry *ip)
+usal_printdev(struct scsi_inquiry *ip)
{
- scg_fprintdev(stdout, ip);
+ usal_fprintdev(stdout, ip);
}
#include <vadefs.h>
@@ -1291,19 +1291,19 @@
*/
/* VARARGS2 */
int
-scg_printf(SCSI *scgp, const char *form, ...)
+usal_printf(SCSI *usalp, const char *form, ...)
{
int cnt;
va_list args;
va_start(args, form);
- cnt = js_snprintf(scgp->errptr, scg_errrsize(scgp), "%r", form, args);
+ cnt = js_snprintf(usalp->errptr, usal_errrsize(usalp), "%r", form, args);
va_end(args);
if (cnt < 0) {
- scgp->errptr[0] = '\0';
+ usalp->errptr[0] = '\0';
} else {
- scgp->errptr += cnt;
+ usalp->errptr += cnt;
}
return (cnt);
}
@@ -1313,12 +1313,12 @@
* Clear error buffer after flushing.
*/
int
-scg_errflush(SCSI *scgp)
+usal_errflush(SCSI *usalp)
{
- if (scgp->errfile == NULL)
+ if (usalp->errfile == NULL)
return (0);
- return (scg_errfflush(scgp, (FILE *)scgp->errfile));
+ return (usal_errfflush(usalp, (FILE *)usalp->errfile));
}
/*
@@ -1326,15 +1326,15 @@
* Clear error buffer after flushing.
*/
int
-scg_errfflush(SCSI *scgp, FILE *f)
+usal_errfflush(SCSI *usalp, FILE *f)
{
int cnt;
- cnt = scgp->errptr - scgp->errbeg;
+ cnt = usalp->errptr - usalp->errbeg;
if (cnt > 0) {
- filewrite(f, scgp->errbeg, cnt);
+ filewrite(f, usalp->errbeg, cnt);
fflush(f);
- scgp->errbeg = scgp->errptr;
+ usalp->errbeg = usalp->errptr;
}
return (cnt);
}
Modified: cdrkit/trunk/mkisofs/CMakeLists.txt
===================================================================
--- cdrkit/trunk/mkisofs/CMakeLists.txt 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/mkisofs/CMakeLists.txt 2006-11-23 18:57:28 UTC (rev 430)
@@ -28,7 +28,7 @@
boot-mipsel.c endian.c )
#SET_SOURCE_FILES_PROPERTIES(${MKISOFS_MOST_SRCS} PROPERTIES )
-LINK_DIRECTORIES(../libhfs_iso ../libschily ../libscg ../libunls ../libdeflt)
+LINK_DIRECTORIES(../libhfs_iso ../libschily ../libusal ../libunls ../libdeflt)
ADD_EXECUTABLE (mkisofs mkisofs.c ${MKISOFS_MOST_SRCS})
TARGET_LINK_LIBRARIES(mkisofs hfs_iso deflt ${MAGICLIBS} c unls z ${EXTRA_LIBICONV} ${EXTRA_LIBS})
Modified: cdrkit/trunk/mkisofs/ChangeLog
===================================================================
--- cdrkit/trunk/mkisofs/ChangeLog 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/mkisofs/ChangeLog 2006-11-23 18:57:28 UTC (rev 430)
@@ -117,11 +117,11 @@
* isovfy.c 1.22
* isodebug.mk 1.2
* isodebug.c 1.7
- Umstellung auf libscg
+ Umstellung auf libusal
Sat May 29 17:46:26 2004 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* isoinfo.c 1.45
- cdr_defaults() nur mit libscg rufen
+ cdr_defaults() nur mit libusal rufen
Sat May 29 16:55:08 2004 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* isodebug.c 1.6
@@ -139,7 +139,7 @@
Fri May 28 13:37:39 2004 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* isoinfo.c 1.42
Version -> 2.01a31
- Umbau auf libscg
+ Umbau auf libusal
Fri May 28 13:36:25 2004 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* isodump.c 1.21
@@ -1515,7 +1515,7 @@
Fri Dec 1 14:14:23 2000 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* multi.c 1.42
- Now working without scg_prbytes() from libscg
+ Now working without usal_prbytes() from libusal
Fri Nov 24 10:49:58 2000 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* mkisofs.c 1.75
@@ -1551,7 +1551,7 @@
Fri Sep 8 02:49:31 2000 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* scsi.c 1.16
- Call to scg_remote()
+ Call to usal_remote()
Fri Sep 8 02:49:00 2000 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* mkisofs.c 1.73
@@ -1569,7 +1569,7 @@
Sun Jul 30 14:08:38 2000 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* multi.c 1.41
* scsi.c 1.15
- Modified for new libscg with scg_*()
+ Modified for new libusal with usal_*()
Thu Jul 20 19:29:19 2000 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* mkisofs.c 1.70
@@ -2629,7 +2629,7 @@
Sun Nov 29 19:13:43 1998 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* scsi.c 1.8
- scgio.h -> scgcmd.h/scgio.h, scgio.h scgcmd.h scsidefs.h scsireg.h scsitransp.h -> include/scg
+ usalio.h -> usalcmd.h/usalio.h, usalio.h usalcmd.h scsidefs.h scsireg.h scsitransp.h -> include/usal
Sun Nov 29 18:30:41 1998 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* Makefile 1.1
@@ -2641,7 +2641,7 @@
Fri Oct 30 02:06:35 1998 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* scsi.c 1.7
- open_scsi() returniert nun SCSI *scgp, wird auch fuer read_scsi() verwendet
+ open_scsi() returniert nun SCSI *usalp, wird auch fuer read_scsi() verwendet
Sat Oct 24 01:29:24 1998 Joerg Schilling <joerg at schily.isdn.cs.tu-berlin.de>
* scsi.c 1.6
Modified: cdrkit/trunk/mkisofs/diag/dump.mk
===================================================================
--- cdrkit/trunk/mkisofs/diag/dump.mk 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/mkisofs/diag/dump.mk 2006-11-23 18:57:28 UTC (rev 430)
@@ -28,7 +28,7 @@
CFILES= dump.c \
scsi.c scsi_cdr.c cd_misc.c modes.c \
defaults.c getnum.c
-LIBS= -lrscg -lscg $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)
+LIBS= -lrusal -lusal $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)
XMK_FILE= devdump_man.mk
###########################################################################
Modified: cdrkit/trunk/mkisofs/diag/isodebug.8
===================================================================
--- cdrkit/trunk/mkisofs/diag/isodebug.8 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/mkisofs/diag/isodebug.8 2006-11-23 18:57:28 UTC (rev 430)
@@ -55,7 +55,7 @@
.SH FILES
.SH "SEE ALSO"
.BR wodim (1),
-.BR scg (7),
+.BR usal (7),
.BR mkisofs (8).
.SH AUTHOR
.nf
Modified: cdrkit/trunk/mkisofs/diag/isodebug.mk
===================================================================
--- cdrkit/trunk/mkisofs/diag/isodebug.mk 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/mkisofs/diag/isodebug.mk 2006-11-23 18:57:28 UTC (rev 430)
@@ -28,7 +28,7 @@
CFILES= isodebug.c \
scsi.c scsi_cdr.c cd_misc.c modes.c \
defaults.c getnum.c
-LIBS= -lrscg -lscg $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)
+LIBS= -lrusal -lusal $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)
XMK_FILE= isodebug_man.mk
###########################################################################
Modified: cdrkit/trunk/mkisofs/diag/isodump.mk
===================================================================
--- cdrkit/trunk/mkisofs/diag/isodump.mk 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/mkisofs/diag/isodump.mk 2006-11-23 18:57:28 UTC (rev 430)
@@ -28,7 +28,7 @@
CFILES= isodump.c \
scsi.c scsi_cdr.c cd_misc.c modes.c \
defaults.c getnum.c
-LIBS= -lrscg -lscg $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)
+LIBS= -lrusal -lusal $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)
XMK_FILE= isodump_man.mk
###########################################################################
Modified: cdrkit/trunk/mkisofs/diag/isoinfo.8
===================================================================
--- cdrkit/trunk/mkisofs/diag/isoinfo.8 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/mkisofs/diag/isoinfo.8 2006-11-23 18:57:28 UTC (rev 430)
@@ -354,7 +354,7 @@
.BR mkisofs (8),
.BR wodim (1),
.BR readcd (1),
-.BR scg (7),
+.BR usal (7),
.BR rcmd (3),
.BR ssh (1).
.RE
Modified: cdrkit/trunk/mkisofs/diag/isoinfo.mk
===================================================================
--- cdrkit/trunk/mkisofs/diag/isoinfo.mk 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/mkisofs/diag/isoinfo.mk 2006-11-23 18:57:28 UTC (rev 430)
@@ -28,7 +28,7 @@
CFILES= isoinfo.c \
scsi.c scsi_cdr.c cd_misc.c modes.c \
defaults.c getnum.c
-LIBS= -lunls -lrscg -lscg $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)
+LIBS= -lunls -lrusal -lusal $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)
XMK_FILE= isoinfo_man.mk
###########################################################################
Modified: cdrkit/trunk/mkisofs/diag/isovfy.mk
===================================================================
--- cdrkit/trunk/mkisofs/diag/isovfy.mk 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/mkisofs/diag/isovfy.mk 2006-11-23 18:57:28 UTC (rev 430)
@@ -28,7 +28,7 @@
CFILES= isovfy.c \
scsi.c scsi_cdr.c cd_misc.c modes.c \
defaults.c getnum.c
-LIBS= -lrscg -lscg $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)
+LIBS= -lrusal -lusal $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)
XMK_FILE= isovfy_man.mk
###########################################################################
Modified: cdrkit/trunk/mkisofs/more.mapping
===================================================================
--- cdrkit/trunk/mkisofs/more.mapping 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/mkisofs/more.mapping 2006-11-23 18:57:28 UTC (rev 430)
@@ -204,7 +204,7 @@
.rtx Ascii 'TBB6' 'TEXT' "TexEdit - Rich Text (text/richtext)"
.s3m Raw 'SNPL' 'S3M ' "PlayerPro - ScreamTracker 3 MOD"
.scc Raw 'GKON' 'MSX ' "GraphicConverter - MSX pitcure"
-.scg Raw 'GKON' 'RIX3' "GraphicConverter - ColoRIX"
+.usal Raw 'GKON' 'RIX3' "GraphicConverter - ColoRIX"
.sci Raw 'GKON' 'RIX3' "GraphicConverter - ColoRIX"
.scp Raw 'GKON' 'RIX3' "GraphicConverter - ColoRIX"
.scr Raw 'GKON' 'RIX3' "GraphicConverter - ColoRIX"
Modified: cdrkit/trunk/mkisofs/scsi.c
===================================================================
--- cdrkit/trunk/mkisofs/scsi.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/mkisofs/scsi.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -43,8 +43,8 @@
#include <schily.h>
#include "mkisofs.h"
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include "wodim.h"
#include "../wodim/defaults.h"
@@ -60,7 +60,7 @@
*/
#define BUF_SIZE (62*1024) /* Must be a multiple of 2048 */
-static SCSI *scgp;
+static SCSI *usalp;
static long bufsize; /* The size of the transfer buffer */
int readsecs(int startsecno, void *buffer, int sectorcount);
@@ -86,7 +86,7 @@
* XXX We assume that secsize is no more than SECTOR_SIZE
* XXX and that SECTOR_SIZE / secsize is not a fraction.
*/
- secsize = scgp->cap->c_bsize;
+ secsize = usalp->cap->c_bsize;
amount = sectorcount * SECTOR_SIZE;
secno = startsecno * (SECTOR_SIZE / secsize);
bp = buffer;
@@ -97,8 +97,8 @@
amt = bufsize;
secnum = amt / secsize;
- if (read_scsi(scgp, bp, secno, secnum) < 0 ||
- scg_getresid(scgp) != 0) {
+ if (read_scsi(usalp, bp, secno, secnum) < 0 ||
+ usal_getresid(usalp) != 0) {
#ifdef OLD
return (-1);
#else
@@ -149,39 +149,39 @@
/* has been allocated by scsi_getbuf() */
/*
- * Call scg_remote() to force loading the remote SCSI transport library
- * code that is located in librscg instead of the dummy remote routines
- * that are located inside libscg.
+ * Call usal_remote() to force loading the remote SCSI transport library
+ * code that is located in librusal instead of the dummy remote routines
+ * that are located inside libusal.
*/
- scg_remote();
+ usal_remote();
cdr_defaults(&path, NULL, NULL, NULL);
/* path, debug, verboseopen */
- scgp = scg_open(path, errstr, sizeof (errstr), 0, 0);
- if (scgp == 0) {
+ usalp = usal_open(path, errstr, sizeof (errstr), 0, 0);
+ if (usalp == 0) {
errmsg("%s%sCannot open SCSI driver.\n", errstr, errstr[0]?". ":"");
return (-1);
}
- bufsize = scg_bufsize(scgp, BUF_SIZE);
- if ((buf = scg_getbuf(scgp, bufsize)) == NULL) {
+ bufsize = usal_bufsize(usalp, BUF_SIZE);
+ if ((buf = usal_getbuf(usalp, bufsize)) == NULL) {
errmsg("Cannot get SCSI I/O buffer.\n");
- scg_close(scgp);
+ usal_close(usalp);
return (-1);
}
bufsize = (bufsize / SECTOR_SIZE) * SECTOR_SIZE;
- allow_atapi(scgp, TRUE);
+ allow_atapi(usalp, TRUE);
- if (!wait_unit_ready(scgp, 60)) { /* Eat Unit att / Wait for drive */
- scgp->silent--;
+ if (!wait_unit_ready(usalp, 60)) { /* Eat Unit att / Wait for drive */
+ usalp->silent--;
return (-1);
}
- scgp->silent++;
- read_capacity(scgp); /* Set Capacity/Sectorsize for I/O */
- scgp->silent--;
+ usalp->silent++;
+ read_capacity(usalp); /* Set Capacity/Sectorsize for I/O */
+ usalp->silent--;
return (1);
}
@@ -190,7 +190,7 @@
scsidev_close()
{
if (in_image == NULL) {
- return (scg_close(scgp));
+ return (usal_close(usalp));
} else {
return (fclose(in_image));
}
Modified: cdrkit/trunk/readcd/CMakeLists.txt
===================================================================
--- cdrkit/trunk/readcd/CMakeLists.txt 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/readcd/CMakeLists.txt 2006-11-23 18:57:28 UTC (rev 430)
@@ -5,7 +5,7 @@
AUX_SOURCE_DIRECTORY(. READCD_SRCS)
-LINK_DIRECTORIES(../libschily ../libscg ../libdeflt)
+LINK_DIRECTORIES(../libschily ../libusal ../libdeflt)
ADD_DEFINITIONS(-DCLONE_WRITE)
Modified: cdrkit/trunk/readcd/readcd.1
===================================================================
--- cdrkit/trunk/readcd/readcd.1 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/readcd/readcd.1 2006-11-23 18:57:28 UTC (rev 430)
@@ -47,7 +47,7 @@
.I device
refers to a device location similar to the one used in the wodim command. Refer to its manpage for details.
.PP
-Also note that this version of readcd uses a modified libscg library which has
+Also note that this version of readcd uses a modified libusal library which has
a different behaviour compared to the one distributed by its original author.
.SH OPTIONS
@@ -120,7 +120,7 @@
.I -dd,
this equals to
.BI debug= 2.
-This may help to find problems while opening a driver for libscg.
+This may help to find problems while opening a driver for libusal.
as well as with sector sizes and sector types.
Using
.B \-debug
@@ -128,7 +128,7 @@
.TP
.BR kdebug= "#, " kd= #
Tell the
-.BR scg -driver
+.BR usal -driver
to modify the kernel debug value while SCSI commands are running.
.TP
.BR \-silent ", " \-s
@@ -218,7 +218,7 @@
.B ts=
option has been specified,
.B readcd
-defaults to a transfer size of 256 kB. If libscg gets lower values from the
+defaults to a transfer size of 256 kB. If libusal gets lower values from the
operating system, the value is reduced to the maximum value that is possible
with the current operating system.
Sometimes, it may help to further reduce the transfer size or to enhance it,
Modified: cdrkit/trunk/readcd/readcd.c
===================================================================
--- cdrkit/trunk/readcd/readcd.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/readcd/readcd.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -16,7 +16,7 @@
"@(#)readcd.c 1.80 06/02/05 Copyright 1987, 1995-2006 J. Schilling";
#endif
/*
- * Skeleton for the use of the scg genearal SCSI - driver
+ * Skeleton for the use of the usal genearal SCSI - driver
*
* Copyright (c) 1987, 1995-2004 J. Schilling
*/
@@ -53,9 +53,9 @@
#include <io.h> /* for setmode() prototype */
#endif
-#include <scg/scgcmd.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include "scsi_scan.h"
#include "scsimmc.h"
@@ -102,7 +102,7 @@
} rparm_t;
struct exargs {
- SCSI *scgp;
+ SCSI *usalp;
int old_secsize;
int flags;
int exflags;
@@ -118,71 +118,71 @@
static void excdr(int excode, void *arg);
static int prstats(void);
static int prstats_silent(void);
-static void dorw(SCSI *scgp, char *filename, char *sectors);
-static void doit(SCSI *scgp);
-static void read_disk(SCSI *scgp, parm_t *parmp);
+static void dorw(SCSI *usalp, char *filename, char *sectors);
+static void doit(SCSI *usalp);
+static void read_disk(SCSI *usalp, parm_t *parmp);
#ifdef CLONE_WRITE
-static void readcd_disk(SCSI *scgp, parm_t *parmp);
-static void read_lin(SCSI *scgp, parm_t *parmp);
-static int read_secheader(SCSI *scgp, long addr);
-static int read_ftoc(SCSI *scgp, parm_t *parmp, BOOL do_sectype);
-static void read_sectypes(SCSI *scgp, FILE *f);
-static void get_sectype(SCSI *scgp, long addr, char *st);
+static void readcd_disk(SCSI *usalp, parm_t *parmp);
+static void read_lin(SCSI *usalp, parm_t *parmp);
+static int read_secheader(SCSI *usalp, long addr);
+static int read_ftoc(SCSI *usalp, parm_t *parmp, BOOL do_sectype);
+static void read_sectypes(SCSI *usalp, FILE *f);
+static void get_sectype(SCSI *usalp, long addr, char *st);
#endif
-static void readc2_disk(SCSI *scgp, parm_t *parmp);
-static int fread_data(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr,
+static void readc2_disk(SCSI *usalp, parm_t *parmp);
+static int fread_data(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr,
int cnt);
#ifdef CLONE_WRITE
-static int fread_2448(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr,
+static int fread_2448(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr,
int cnt);
-static int fread_2448_16(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr,
+static int fread_2448_16(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr,
int cnt);
-static int fread_2352(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr,
+static int fread_2352(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr,
int cnt);
-static int fread_lin(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr,
+static int fread_lin(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr,
int cnt);
#endif
static int bits(int c);
static int bitidx(int c);
-static int fread_c2(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr,
+static int fread_c2(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr,
int cnt);
static int fdata_null(rparm_t *rp, caddr_t bp, long addr, int cnt);
static int fdata_c2(rparm_t *rp, caddr_t bp, long addr, int cnt);
#ifdef used
-static int read_scsi_g1(SCSI *scgp, caddr_t bp, long addr, int cnt);
+static int read_scsi_g1(SCSI *usalp, caddr_t bp, long addr, int cnt);
#endif
-int write_scsi(SCSI *scgp, caddr_t bp, long addr, int cnt);
-int write_g0(SCSI *scgp, caddr_t bp, long addr, int cnt);
-int write_g1(SCSI *scgp, caddr_t bp, long addr, int cnt);
+int write_scsi(SCSI *usalp, caddr_t bp, long addr, int cnt);
+int write_g0(SCSI *usalp, caddr_t bp, long addr, int cnt);
+int write_g1(SCSI *usalp, caddr_t bp, long addr, int cnt);
#ifdef used
-static void Xrequest_sense(SCSI *scgp);
+static void Xrequest_sense(SCSI *usalp);
#endif
-static int read_retry(SCSI *scgp, caddr_t bp, long addr, long cnt,
- int (*rfunc)(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr, int cnt),
+static int read_retry(SCSI *usalp, caddr_t bp, long addr, long cnt,
+ int (*rfunc)(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr, int cnt),
rparm_t *rp);
-static void read_generic(SCSI *scgp, parm_t *parmp,
- int (*rfunc)(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr, int cnt),
+static void read_generic(SCSI *usalp, parm_t *parmp,
+ int (*rfunc)(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr, int cnt),
rparm_t *rp,
int (*dfunc)(rparm_t *rp, caddr_t bp, long addr, int cnt));
-static void write_disk(SCSI *scgp, parm_t *parmp);
+static void write_disk(SCSI *usalp, parm_t *parmp);
static int choice(int n);
-static void ra(SCSI *scgp);
+static void ra(SCSI *usalp);
-int read_da(SCSI *scgp, caddr_t bp, long addr, int cnt, int framesize,
+int read_da(SCSI *usalp, caddr_t bp, long addr, int cnt, int framesize,
int subcode);
-int read_cd(SCSI *scgp, caddr_t bp, long addr, int cnt, int framesize,
+int read_cd(SCSI *usalp, caddr_t bp, long addr, int cnt, int framesize,
int data, int subch);
-static void oldmode(SCSI *scgp, int *errp, int *retrp);
-static void domode(SCSI *scgp, int err, int retr);
+static void oldmode(SCSI *usalp, int *errp, int *retrp);
+static void domode(SCSI *usalp, int err, int retr);
static void qpto96(Uchar *sub, Uchar *subq, int dop);
-static void ovtime(SCSI *scgp);
+static void ovtime(SCSI *usalp);
static void add_bad(long addr);
static void print_bad(void);
@@ -283,7 +283,7 @@
int scanbus = 0;
int speed = -1;
int dooverhead = 0;
- SCSI *scgp;
+ SCSI *usalp;
char *filename = NULL;
char *sectors = NULL;
@@ -318,7 +318,7 @@
printf("readcd %s (%s) "
"Copyright (C) 1987, 1995-2006 Joerg Schilling\n",
cdr_version, HOST_SYSTEM);
- printf("(using modified version of libscg -- "
+ printf("(using modified version of libusal -- "
"don't bother Joerg Schilling with problems)\n");
exit(0);
}
@@ -374,18 +374,18 @@
char errstr[80];
/*
- * Call scg_remote() to force loading the remote SCSI transport
- * library code that is located in librscg instead of the dummy
- * remote routines that are located inside libscg.
+ * Call usal_remote() to force loading the remote SCSI transport
+ * library code that is located in librusal instead of the dummy
+ * remote routines that are located inside libusal.
*/
- scg_remote();
+ usal_remote();
if (dev != NULL &&
((strncmp(dev, "HELP", 4) == 0) ||
(strncmp(dev, "help", 4) == 0))) {
- scg_help(stderr);
+ usal_help(stderr);
exit(0);
}
- if ((scgp = scg_open(dev, errstr, sizeof (errstr), debug, lverbose)) == (SCSI *)0) {
+ if ((usalp = usal_open(dev, errstr, sizeof (errstr), debug, lverbose)) == (SCSI *)0) {
int err = geterrno();
errmsgno(err, "%s%sCannot open SCSI driver.\n", errstr, errstr[0]?". ":"");
@@ -398,24 +398,24 @@
if (scsibus == -1 && target >= 0 && lun >= 0)
scsibus = 0;
- scgp = scg_smalloc();
- scgp->debug = debug;
- scgp->kdebug = kdebug;
+ usalp = usal_smalloc();
+ usalp->debug = debug;
+ usalp->kdebug = kdebug;
- scg_settarget(scgp, scsibus, target, lun);
- if (scg__open(scgp, NULL) <= 0)
+ usal_settarget(usalp, scsibus, target, lun);
+ if (usal__open(usalp, NULL) <= 0)
comerr("Cannot open SCSI driver.\n");
}
- scgp->silent = silent;
- scgp->verbose = verbose;
- scgp->debug = debug;
- scgp->kdebug = kdebug;
- scg_settimeout(scgp, deftimeout);
+ usalp->silent = silent;
+ usalp->verbose = verbose;
+ usalp->debug = debug;
+ usalp->kdebug = kdebug;
+ usal_settimeout(usalp, deftimeout);
if (Sbufsize == 0)
Sbufsize = 256*1024L;
- Sbufsize = scg_bufsize(scgp, Sbufsize);
- if ((Sbuf = scg_getbuf(scgp, Sbufsize)) == NULL)
+ Sbufsize = usal_bufsize(usalp, Sbufsize);
+ if ((Sbuf = usal_getbuf(usalp, Sbufsize)) == NULL)
comerr("Cannot get SCSI I/O buffer.\n");
#ifdef HAVE_PRIV_SET
@@ -457,12 +457,12 @@
/* code to use SCG */
if (scanbus) {
- select_target(scgp, stdout);
+ select_target(usalp, stdout);
exit(0);
}
- do_inquiry(scgp, FALSE);
- allow_atapi(scgp, TRUE); /* Try to switch to 10 byte mode cmds */
- if (is_mmc(scgp, NULL, NULL)) {
+ do_inquiry(usalp, FALSE);
+ allow_atapi(usalp, TRUE); /* Try to switch to 10 byte mode cmds */
+ if (is_mmc(usalp, NULL, NULL)) {
int rspeed;
int wspeed;
/*
@@ -472,10 +472,10 @@
* tell us not to use the "PF" bit in mode select. As ATAPI drives
* require the "PF" bit to be set, we 'correct' the inquiry data.
*/
- if (scgp->inq->data_format < 2)
- scgp->inq->data_format = 2;
+ if (usalp->inq->data_format < 2)
+ usalp->inq->data_format = 2;
- if ((rspeed = get_curprofile(scgp)) >= 0) {
+ if ((rspeed = get_curprofile(usalp)) >= 0) {
if (rspeed >= 0x08 && rspeed < 0x10)
is_cdrom = TRUE;
if (rspeed >= 0x10 && rspeed < 0x20)
@@ -483,13 +483,13 @@
} else {
BOOL dvd;
- mmc_check(scgp, NULL, NULL, NULL, NULL, &dvd, NULL);
+ mmc_check(usalp, NULL, NULL, NULL, NULL, &dvd, NULL);
if (dvd == FALSE) {
is_cdrom = TRUE;
} else {
char xb[32];
- if (read_dvd_structure(scgp, (caddr_t)xb, 32, 0, 0, 0) >= 0) {
+ if (read_dvd_structure(usalp, (caddr_t)xb, 32, 0, 0, 0) >= 0) {
/*
* If read DVD structure is supported and works, then
* we must have a DVD media in the drive. Signal to
@@ -506,15 +506,15 @@
speed *= 177;
if (speed > 0xFFFF || speed < 0)
speed = 0xFFFF;
- scsi_set_speed(scgp, speed, speed, ROTCTL_CLV);
- if (scsi_get_speed(scgp, &rspeed, &wspeed) >= 0) {
+ scsi_set_speed(usalp, speed, speed, ROTCTL_CLV);
+ if (scsi_get_speed(usalp, &rspeed, &wspeed) >= 0) {
fprintf(stderr, "Read speed: %5d kB/s (CD %3dx, DVD %2dx).\n",
rspeed, rspeed/176, rspeed/1385);
fprintf(stderr, "Write speed: %5d kB/s (CD %3dx, DVD %2dx).\n",
wspeed, wspeed/176, wspeed/1385);
}
}
- exargs.scgp = scgp;
+ exargs.usalp = usalp;
exargs.old_secsize = -1;
/* exargs.flags = flags;*/
exargs.oerr[2] = 0;
@@ -527,19 +527,19 @@
signal(SIGTERM, intr);
if (dooverhead) {
- ovtime(scgp);
+ ovtime(usalp);
comexit(0);
}
if (is_suid) {
- if (scgp->inq->type != INQ_ROMD)
+ if (usalp->inq->type != INQ_ROMD)
comerrno(EX_BAD, "Not root. Will only work on CD-ROM in suid/priv mode\n");
}
if (filename || sectors || c2scan || meshpoints || fulltoc || clone) {
- dorw(scgp, filename, sectors);
+ dorw(usalp, filename, sectors);
} else {
- doit(scgp);
+ doit(usalp);
}
comexit(0);
return (0);
@@ -570,7 +570,7 @@
*/
if (exp != NULL && exp->exflags == 0) {
for (i = 0; i < 10*100; i++) {
- if (!exp->scgp->running)
+ if (!exp->usalp->running)
break;
if (i == 10) {
errmsgno(EX_BAD,
@@ -579,12 +579,12 @@
usleep(100000);
}
- if (!exp->scgp->running) {
+ if (!exp->usalp->running) {
if (exp->oerr[2] != 0) {
- domode(exp->scgp, exp->oerr[0], exp->oerr[1]);
+ domode(exp->usalp, exp->oerr[0], exp->oerr[1]);
}
if (exp->old_secsize > 0 && exp->old_secsize != 2048)
- select_secsize(exp->scgp, exp->old_secsize);
+ select_secsize(exp->usalp, exp->old_secsize);
}
exp->exflags++; /* Make sure that it only get called once */
}
@@ -656,7 +656,7 @@
}
static void
-dorw(SCSI *scgp, char *filename, char *sectors)
+dorw(SCSI *usalp, char *filename, char *sectors)
{
parm_t params;
char *p = NULL;
@@ -680,16 +680,16 @@
if (p && *p != '\0')
comerrno(EX_BAD, "Not a valid sector range '%s'\n", sectors);
- if (!wait_unit_ready(scgp, 60))
+ if (!wait_unit_ready(usalp, 60))
comerrno(EX_BAD, "Device not ready.\n");
#ifdef CLONE_WRITE
if (fulltoc) {
if (params.name == NULL)
params.name = "/dev/null";
- read_ftoc(scgp, ¶ms, FALSE);
+ read_ftoc(usalp, ¶ms, FALSE);
} else if (clone) {
- if (!is_mmc(scgp, NULL, NULL))
+ if (!is_mmc(usalp, NULL, NULL))
comerrno(EX_BAD, "Unsupported device for clone mode.\n");
noerror = TRUE;
if (retries == MAX_RETRY)
@@ -697,9 +697,9 @@
if (params.name == NULL)
params.name = "/dev/null";
- if (read_ftoc(scgp, ¶ms, TRUE) < 0)
+ if (read_ftoc(usalp, ¶ms, TRUE) < 0)
comerrno(EX_BAD, "Read fulltoc problems.\n");
- readcd_disk(scgp, ¶ms);
+ readcd_disk(usalp, ¶ms);
} else
#endif
if (c2scan) {
@@ -708,15 +708,15 @@
retries = 10;
if (params.name == NULL)
params.name = "/dev/null";
- readc2_disk(scgp, ¶ms);
+ readc2_disk(usalp, ¶ms);
} else if (do_write)
- write_disk(scgp, ¶ms);
+ write_disk(usalp, ¶ms);
else
- read_disk(scgp, ¶ms);
+ read_disk(usalp, ¶ms);
}
static void
-doit(SCSI *scgp)
+doit(SCSI *usalp)
{
int i = 0;
parm_t params;
@@ -728,7 +728,7 @@
params.name = "/dev/null";
for (;;) {
- if (!wait_unit_ready(scgp, 60))
+ if (!wait_unit_ready(usalp, 60))
comerrno(EX_BAD, "Device not ready.\n");
printf("0:read 1:veri 2:erase 3:read buffer 4:cache 5:ovtime 6:cap\n");
@@ -744,58 +744,58 @@
switch (i) {
- case 5: ovtime(scgp); break;
- case 11: read_disk(scgp, 0); break;
- case 12: write_disk(scgp, 0); break;
- case 15: ra(scgp); break;
-/* case 16: reada_disk(scgp, 0, 0); break;*/
- case 17: readc2_disk(scgp, ¶ms); break;
+ case 5: ovtime(usalp); break;
+ case 11: read_disk(usalp, 0); break;
+ case 12: write_disk(usalp, 0); break;
+ case 15: ra(usalp); break;
+/* case 16: reada_disk(usalp, 0, 0); break;*/
+ case 17: readc2_disk(usalp, ¶ms); break;
#ifdef CLONE_WRITE
- case 18: readcd_disk(scgp, 0); break;
- case 19: read_lin(scgp, 0); break;
- case 20: read_ftoc(scgp, 0, FALSE); break;
+ case 18: readcd_disk(usalp, 0); break;
+ case 19: read_lin(usalp, 0); break;
+ case 20: read_ftoc(usalp, 0, FALSE); break;
#endif
}
}
}
static void
-read_disk(SCSI *scgp, parm_t *parmp)
+read_disk(SCSI *usalp, parm_t *parmp)
{
rparm_t rp;
- read_capacity(scgp);
- print_capacity(scgp, stderr);
+ read_capacity(usalp);
+ print_capacity(usalp, stderr);
rp.errors = 0;
rp.c2_errors = 0;
rp.c2_maxerrs = 0;
rp.c2_errsecs = 0;
rp.c2_badsecs = 0;
- rp.secsize = scgp->cap->c_bsize;
+ rp.secsize = usalp->cap->c_bsize;
- read_generic(scgp, parmp, fread_data, &rp, fdata_null);
+ read_generic(usalp, parmp, fread_data, &rp, fdata_null);
}
#ifdef CLONE_WRITE
static void
-readcd_disk(SCSI *scgp, parm_t *parmp)
+readcd_disk(SCSI *usalp, parm_t *parmp)
{
rparm_t rp;
int osecsize = 2048;
int oerr = 0;
int oretr = 10;
- int (*funcp)(SCSI *_scgp, rparm_t *_rp, caddr_t bp, long addr, int cnt);
+ int (*funcp)(SCSI *_usalp, rparm_t *_rp, caddr_t bp, long addr, int cnt);
- scgp->silent++;
- if (read_capacity(scgp) >= 0)
- osecsize = scgp->cap->c_bsize;
- scgp->silent--;
+ usalp->silent++;
+ if (read_capacity(usalp) >= 0)
+ osecsize = usalp->cap->c_bsize;
+ usalp->silent--;
if (osecsize != 2048)
- select_secsize(scgp, 2048);
+ select_secsize(usalp, 2048);
- read_capacity(scgp);
- print_capacity(scgp, stderr);
+ read_capacity(usalp);
+ print_capacity(usalp, stderr);
rp.errors = 0;
rp.c2_errors = 0;
@@ -803,44 +803,44 @@
rp.c2_errsecs = 0;
rp.c2_badsecs = 0;
rp.secsize = 2448;
- rp.ismmc = is_mmc(scgp, NULL, NULL);
+ rp.ismmc = is_mmc(usalp, NULL, NULL);
funcp = fread_2448;
- wait_unit_ready(scgp, 10);
- if (fread_2448(scgp, &rp, Sbuf, 0, 0) < 0) {
+ wait_unit_ready(usalp, 10);
+ if (fread_2448(usalp, &rp, Sbuf, 0, 0) < 0) {
errmsgno(EX_BAD, "read 2448 failed\n");
if (rp.ismmc &&
- fread_2448_16(scgp, &rp, Sbuf, 0, 0) >= 0) {
+ fread_2448_16(usalp, &rp, Sbuf, 0, 0) >= 0) {
errmsgno(EX_BAD, "read 2448_16 : OK\n");
funcp = fread_2448_16;
}
}
- oldmode(scgp, &oerr, &oretr);
+ oldmode(usalp, &oerr, &oretr);
exargs.oerr[0] = oerr;
exargs.oerr[1] = oretr;
exargs.oerr[2] = 0xFF;
if (parmp == NULL) /* XXX Nur am Anfang!!! */
- domode(scgp, -1, -1);
+ domode(usalp, -1, -1);
else
- domode(scgp, nocorr?0x21:0x20, 10);
+ domode(usalp, nocorr?0x21:0x20, 10);
- read_generic(scgp, parmp, funcp, &rp, fdata_null);
+ read_generic(usalp, parmp, funcp, &rp, fdata_null);
if (osecsize != 2048)
- select_secsize(scgp, osecsize);
- domode(scgp, oerr, oretr);
+ select_secsize(usalp, osecsize);
+ domode(usalp, oerr, oretr);
}
/* ARGSUSED */
static void
-read_lin(SCSI *scgp, parm_t *parmp)
+read_lin(SCSI *usalp, parm_t *parmp)
{
parm_t parm;
rparm_t rp;
- read_capacity(scgp);
- print_capacity(scgp, stderr);
+ read_capacity(usalp);
+ print_capacity(usalp, stderr);
parm.start = ULONG_C(0xF0000000);
parm.end = ULONG_C(0xFF000000);
@@ -852,26 +852,26 @@
rp.c2_errsecs = 0;
rp.c2_badsecs = 0;
rp.secsize = 2448;
- rp.ismmc = is_mmc(scgp, NULL, NULL);
- domode(scgp, -1, -1);
- read_generic(scgp, &parm, fread_lin, &rp, fdata_null);
+ rp.ismmc = is_mmc(usalp, NULL, NULL);
+ domode(usalp, -1, -1);
+ read_generic(usalp, &parm, fread_lin, &rp, fdata_null);
}
static int
-read_secheader(SCSI *scgp, long addr)
+read_secheader(SCSI *usalp, long addr)
{
rparm_t rp;
int osecsize = 2048;
int ret = 0;
- scgp->silent++;
- if (read_capacity(scgp) >= 0)
- osecsize = scgp->cap->c_bsize;
- scgp->silent--;
+ usalp->silent++;
+ if (read_capacity(usalp) >= 0)
+ osecsize = usalp->cap->c_bsize;
+ usalp->silent--;
if (osecsize != 2048)
- select_secsize(scgp, 2048);
+ select_secsize(usalp, 2048);
- read_capacity(scgp);
+ read_capacity(usalp);
rp.errors = 0;
rp.c2_errors = 0;
@@ -879,22 +879,22 @@
rp.c2_errsecs = 0;
rp.c2_badsecs = 0;
rp.secsize = 2352;
- rp.ismmc = is_mmc(scgp, NULL, NULL);
+ rp.ismmc = is_mmc(usalp, NULL, NULL);
- wait_unit_ready(scgp, 10);
+ wait_unit_ready(usalp, 10);
fillbytes(Sbuf, 2352, '\0');
- if (fread_2352(scgp, &rp, Sbuf, addr, 1) < 0) {
+ if (fread_2352(usalp, &rp, Sbuf, addr, 1) < 0) {
ret = -1;
}
if (osecsize != 2048)
- select_secsize(scgp, osecsize);
+ select_secsize(usalp, osecsize);
return (ret);
}
/* ARGSUSED */
static int
-read_ftoc(SCSI *scgp, parm_t *parmp, BOOL do_sectype)
+read_ftoc(SCSI *usalp, parm_t *parmp, BOOL do_sectype)
{
FILE *f;
int i;
@@ -919,28 +919,28 @@
tp = (struct tocheader *)xb;
fillbytes((caddr_t)xb, sizeof (xb), '\0');
- if (read_toc(scgp, xb, 0, sizeof (struct tocheader), 0, FMT_FULLTOC) < 0) {
- if (scgp->silent == 0 || scgp->verbose > 0)
+ if (read_toc(usalp, xb, 0, sizeof (struct tocheader), 0, FMT_FULLTOC) < 0) {
+ if (usalp->silent == 0 || usalp->verbose > 0)
errmsgno(EX_BAD, "Cannot read TOC header\n");
return (-1);
}
len = a_to_u_2_byte(tp->len) + sizeof (struct tocheader)-2;
fprintf(stderr, "TOC len: %d. First Session: %d Last Session: %d.\n", len, tp->first, tp->last);
- if (read_toc(scgp, xxb, 0, len, 0, FMT_FULLTOC) < 0) {
+ if (read_toc(usalp, xxb, 0, len, 0, FMT_FULLTOC) < 0) {
if (len & 1) {
/*
* Work around a bug in some operating systems that do not
* handle odd byte DMA correctly for ATAPI drives.
*/
- wait_unit_ready(scgp, 30);
- read_toc(scgp, xb, 0, sizeof (struct tocheader), 0, FMT_FULLTOC);
- wait_unit_ready(scgp, 30);
- if (read_toc(scgp, xxb, 0, len+1, 0, FMT_FULLTOC) >= 0) {
+ wait_unit_ready(usalp, 30);
+ read_toc(usalp, xb, 0, sizeof (struct tocheader), 0, FMT_FULLTOC);
+ wait_unit_ready(usalp, 30);
+ if (read_toc(usalp, xxb, 0, len+1, 0, FMT_FULLTOC) >= 0) {
goto itworked;
}
}
- if (scgp->silent == 0)
+ if (usalp->silent == 0)
errmsgno(EX_BAD, "Cannot read full TOC\n");
return (-1);
}
@@ -952,7 +952,7 @@
comerr("Cannot open '%s'.\n", filename);
filewrite(f, xxb, len);
if (do_sectype)
- read_sectypes(scgp, f);
+ read_sectypes(usalp, f);
fflush(f);
fclose(f);
@@ -976,29 +976,29 @@
}
static void
-read_sectypes(SCSI *scgp, FILE *f)
+read_sectypes(SCSI *usalp, FILE *f)
{
char sect;
sect = SECT_AUDIO;
- get_sectype(scgp, 4, §);
+ get_sectype(usalp, 4, §);
if (f != NULL)
filewrite(f, §, 1);
if (xdebug)
- scg_prbytes("sec 0", (Uchar *)Sbuf, 16);
+ usal_prbytes("sec 0", (Uchar *)Sbuf, 16);
sect = SECT_AUDIO;
- get_sectype(scgp, scgp->cap->c_baddr-4, §);
+ get_sectype(usalp, usalp->cap->c_baddr-4, §);
if (f != NULL)
filewrite(f, §, 1);
if (xdebug) {
- scg_prbytes("sec E", (Uchar *)Sbuf, 16);
- fprintf(stderr, "baddr: %ld\n", (long)scgp->cap->c_baddr);
+ usal_prbytes("sec E", (Uchar *)Sbuf, 16);
+ fprintf(stderr, "baddr: %ld\n", (long)usalp->cap->c_baddr);
}
}
static void
-get_sectype(SCSI *scgp, long addr, char *st)
+get_sectype(SCSI *usalp, long addr, char *st)
{
char *synchdr = "\0\377\377\377\377\377\377\377\377\377\377\0";
int sectype = SECT_AUDIO;
@@ -1006,14 +1006,14 @@
long raddr = addr;
#define _MAX_TRY_ 20
- scgp->silent++;
- for (i = 0; i < _MAX_TRY_ && read_secheader(scgp, raddr) < 0; i++) {
+ usalp->silent++;
+ for (i = 0; i < _MAX_TRY_ && read_secheader(usalp, raddr) < 0; i++) {
if (addr == 0)
raddr++;
else
raddr--;
}
- scgp->silent--;
+ usalp->silent--;
if (i >= _MAX_TRY_) {
fprintf(stderr, "Sectype (%ld) is CANNOT\n", addr);
return;
@@ -1075,22 +1075,22 @@
char zeroblk[512];
static void
-readc2_disk(SCSI *scgp, parm_t *parmp)
+readc2_disk(SCSI *usalp, parm_t *parmp)
{
rparm_t rp;
int osecsize = 2048;
int oerr = 0;
int oretr = 10;
- scgp->silent++;
- if (read_capacity(scgp) >= 0)
- osecsize = scgp->cap->c_bsize;
- scgp->silent--;
+ usalp->silent++;
+ if (read_capacity(usalp) >= 0)
+ osecsize = usalp->cap->c_bsize;
+ usalp->silent--;
if (osecsize != 2048)
- select_secsize(scgp, 2048);
+ select_secsize(usalp, 2048);
- read_capacity(scgp);
- print_capacity(scgp, stderr);
+ read_capacity(usalp);
+ print_capacity(usalp, stderr);
rp.errors = 0;
rp.c2_errors = 0;
@@ -1098,52 +1098,52 @@
rp.c2_errsecs = 0;
rp.c2_badsecs = 0;
rp.secsize = 2352 + 294;
- rp.ismmc = is_mmc(scgp, NULL, NULL);
+ rp.ismmc = is_mmc(usalp, NULL, NULL);
- oldmode(scgp, &oerr, &oretr);
+ oldmode(usalp, &oerr, &oretr);
exargs.oerr[0] = oerr;
exargs.oerr[1] = oretr;
exargs.oerr[2] = 0xFF;
- domode(scgp, 0x21, 10);
+ domode(usalp, 0x21, 10);
- read_generic(scgp, parmp, fread_c2, &rp, fdata_c2);
+ read_generic(usalp, parmp, fread_c2, &rp, fdata_c2);
if (osecsize != 2048)
- select_secsize(scgp, osecsize);
- domode(scgp, oerr, oretr);
+ select_secsize(usalp, osecsize);
+ domode(usalp, oerr, oretr);
printf("Total of %d hard read errors.\n", rp.errors);
printf("C2 errors total: %d bytes in %d sectors on disk\n", rp.c2_errors, rp.c2_errsecs);
- printf("C2 errors rate: %f%% \n", (100.0*rp.c2_errors)/scgp->cap->c_baddr/2352);
+ printf("C2 errors rate: %f%% \n", (100.0*rp.c2_errors)/usalp->cap->c_baddr/2352);
printf("C2 errors on worst sector: %d, sectors with 100+ C2 errors: %d\n", rp.c2_maxerrs, rp.c2_badsecs);
}
/* ARGSUSED */
static int
-fread_data(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr, int cnt)
+fread_data(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr, int cnt)
{
- return (read_g1(scgp, bp, addr, cnt));
+ return (read_g1(usalp, bp, addr, cnt));
}
#ifdef CLONE_WRITE
static int
-fread_2448(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr, int cnt)
+fread_2448(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr, int cnt)
{
if (rp->ismmc) {
- return (read_cd(scgp, bp, addr, cnt, rp->secsize,
+ return (read_cd(usalp, bp, addr, cnt, rp->secsize,
/* Sync + all headers + user data + EDC/ECC */
(1 << 7 | 3 << 5 | 1 << 4 | 1 << 3),
/* plus all subchannels RAW */
1));
} else {
- return (read_da(scgp, bp, addr, cnt, rp->secsize,
+ return (read_da(usalp, bp, addr, cnt, rp->secsize,
/* Sync + all headers + user data + EDC/ECC + all subch */
0x02));
}
}
static int
-fread_2448_16(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr, int cnt)
+fread_2448_16(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr, int cnt)
{
if (rp->ismmc) {
@@ -1154,7 +1154,7 @@
trackdesc.isecsize = 2368;
trackdesc.secsize = 2448;
- ret = read_cd(scgp, bp, addr, cnt, 2368,
+ ret = read_cd(usalp, bp, addr, cnt, 2368,
/* Sync + all headers + user data + EDC/ECC */
(1 << 7 | 3 << 5 | 1 << 4 | 1 << 3),
/* subchannels P/Q */
@@ -1179,17 +1179,17 @@
} else {
comerrno(EX_BAD, "Cannot fread_2448_16 on non MMC drives\n");
- return (read_da(scgp, bp, addr, cnt, rp->secsize,
+ return (read_da(usalp, bp, addr, cnt, rp->secsize,
/* Sync + all headers + user data + EDC/ECC + all subch */
0x02));
}
}
static int
-fread_2352(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr, int cnt)
+fread_2352(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr, int cnt)
{
if (rp->ismmc) {
- return (read_cd(scgp, bp, addr, cnt, rp->secsize,
+ return (read_cd(usalp, bp, addr, cnt, rp->secsize,
/* Sync + all headers + user data + EDC/ECC */
(1 << 7 | 3 << 5 | 1 << 4 | 1 << 3),
/* NO subchannels */
@@ -1197,19 +1197,19 @@
} else {
comerrno(EX_BAD, "Cannot fread_2352 on non MMC drives\n");
- return (read_da(scgp, bp, addr, cnt, rp->secsize,
+ return (read_da(usalp, bp, addr, cnt, rp->secsize,
/* Sync + all headers + user data + EDC/ECC + all subch */
0x02));
}
}
static int
-fread_lin(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr, int cnt)
+fread_lin(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr, int cnt)
{
if (addr != ULONG_C(0xF0000000))
addr = ULONG_C(0xFFFFFFFF);
- return (read_cd(scgp, bp, addr, cnt, rp->secsize,
+ return (read_cd(usalp, bp, addr, cnt, rp->secsize,
/* Sync + all headers + user data + EDC/ECC */
(1 << 7 | 3 << 5 | 1 << 4 | 1 << 3),
/* plus all subchannels RAW */
@@ -1264,17 +1264,17 @@
}
static int
-fread_c2(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr, int cnt)
+fread_c2(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr, int cnt)
{
if (rp->ismmc) {
- return (read_cd(scgp, bp, addr, cnt, rp->secsize,
+ return (read_cd(usalp, bp, addr, cnt, rp->secsize,
/* Sync + all headers + user data + EDC/ECC + C2 */
/* (1 << 7 | 3 << 5 | 1 << 4 | 1 << 3 | 2 << 1),*/
(1 << 7 | 3 << 5 | 1 << 4 | 1 << 3 | 1 << 1),
/* without subchannels */
0));
} else {
- return (read_da(scgp, bp, addr, cnt, rp->secsize,
+ return (read_da(usalp, bp, addr, cnt, rp->secsize,
/* Sync + all headers + user data + EDC/ECC + C2 */
0x04));
}
@@ -1298,14 +1298,14 @@
p = &bp[2352];
for (i = 0; i < cnt; i++, p += (2352+294)) {
-/* scg_prbytes("XXX ", p, 294);*/
+/* usal_prbytes("XXX ", p, 294);*/
if ((j = cmpbytes(p, zeroblk, 294)) < 294) {
printf("C2 in sector: %3ld first at byte: %4d (0x%02X)", addr+i,
j*8 + bitidx(p[j]), p[j]&0xFF);
for (j = 0, k = 0; j < 294; j++)
k += bits(p[j]);
printf(" total: %4d errors\n", k);
-/* scg_prbytes("XXX ", p, 294);*/
+/* usal_prbytes("XXX ", p, 294);*/
rp->c2_errors += k;
if (k > rp->c2_maxerrs)
rp->c2_maxerrs = k;
@@ -1319,98 +1319,98 @@
#ifdef used
static int
-read_scsi_g1(SCSI *scgp, caddr_t bp, long addr, int cnt)
+read_scsi_g1(SCSI *usalp, caddr_t bp, long addr, int cnt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
/* scmd->size = cnt*512;*/
- scmd->size = cnt*scgp->cap->c_bsize;
+ scmd->size = cnt*usalp->cap->c_bsize;
scmd->flags = SCG_RECV_DATA|SCG_DISRE_ENA;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x28;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdbaddr(&scmd->cdb.g1_cdb, addr);
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "read extended";
+ usalp->cmdname = "read extended";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
#endif
#define G0_MAXADDR 0x1FFFFFL
int
-write_scsi(SCSI *scgp, caddr_t bp, long addr, int cnt)
+write_scsi(SCSI *usalp, caddr_t bp, long addr, int cnt)
{
if (addr <= G0_MAXADDR)
- return (write_g0(scgp, bp, addr, cnt));
+ return (write_g0(usalp, bp, addr, cnt));
else
- return (write_g1(scgp, bp, addr, cnt));
+ return (write_g1(usalp, bp, addr, cnt));
}
int
-write_g0(SCSI *scgp, caddr_t bp, long addr, int cnt)
+write_g0(SCSI *usalp, caddr_t bp, long addr, int cnt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
- if (scgp->cap->c_bsize <= 0)
+ if (usalp->cap->c_bsize <= 0)
raisecond("capacity_not_set", 0L);
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
- scmd->size = cnt*scgp->cap->c_bsize;
+ scmd->size = cnt*usalp->cap->c_bsize;
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = SC_WRITE;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
g0_cdbaddr(&scmd->cdb.g0_cdb, addr);
scmd->cdb.g0_cdb.count = (Uchar)cnt;
- scgp->cmdname = "write_g0";
+ usalp->cmdname = "write_g0";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
int
-write_g1(SCSI *scgp, caddr_t bp, long addr, int cnt)
+write_g1(SCSI *usalp, caddr_t bp, long addr, int cnt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
- if (scgp->cap->c_bsize <= 0)
+ if (usalp->cap->c_bsize <= 0)
raisecond("capacity_not_set", 0L);
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
- scmd->size = cnt*scgp->cap->c_bsize;
+ scmd->size = cnt*usalp->cap->c_bsize;
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = SC_EWRITE;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdbaddr(&scmd->cdb.g1_cdb, addr);
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "write_g1";
+ usalp->cmdname = "write_g1";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
#ifdef used
static void
-Xrequest_sense(SCSI *scgp)
+Xrequest_sense(SCSI *usalp)
{
char sense_buf[32];
- struct scg_cmd ocmd;
+ struct usal_cmd ocmd;
int sense_count;
char *cmdsave;
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
- cmdsave = scgp->cmdname;
+ cmdsave = usalp->cmdname;
movebytes(scmd, &ocmd, sizeof (*scmd));
@@ -1423,30 +1423,30 @@
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x3;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g0_cdb.count = sizeof (sense_buf);
- scgp->cmdname = "request sense";
+ usalp->cmdname = "request sense";
- scg_cmd(scgp);
+ usal_cmd(usalp);
- sense_count = sizeof (sense_buf) - scg_getresid(scgp);
+ sense_count = sizeof (sense_buf) - usal_getresid(usalp);
movebytes(&ocmd, scmd, sizeof (*scmd));
scmd->sense_count = sense_count;
movebytes(sense_buf, (Uchar *)&scmd->sense, scmd->sense_count);
- scgp->cmdname = cmdsave;
- scg_printerr(scgp);
- scg_printresult(scgp); /* XXX restore key/code in future */
+ usalp->cmdname = cmdsave;
+ usal_printerr(usalp);
+ usal_printresult(usalp); /* XXX restore key/code in future */
}
#endif
static int
-read_retry(SCSI *scgp, caddr_t bp, long addr, long cnt,
- int (*rfunc)(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr, int cnt),
+read_retry(SCSI *usalp, caddr_t bp, long addr, long cnt,
+ int (*rfunc)(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr, int cnt),
rparm_t *rp)
{
-/* int secsize = scgp->cap->c_bsize;*/
+/* int secsize = usalp->cap->c_bsize;*/
int secsize = rp->secsize;
int try = 0;
int err;
@@ -1464,44 +1464,44 @@
do {
if (didintr)
comexit(exsig); /* XXX besseres Konzept?!*/
- wait_unit_ready(scgp, 120);
+ wait_unit_ready(usalp, 120);
if (try >= 10) { /* First 10 retries without seek */
if ((try % 8) == 0) {
fprintf(stderr, "+"); /* Read last sector */
- scgp->silent++;
- (*rfunc)(scgp, rp, dummybuf, scgp->cap->c_baddr, 1);
- scgp->silent--;
+ usalp->silent++;
+ (*rfunc)(usalp, rp, dummybuf, usalp->cap->c_baddr, 1);
+ usalp->silent--;
} else if ((try % 4) == 0) {
fprintf(stderr, "-"); /* Read first sector */
- scgp->silent++;
- (*rfunc)(scgp, rp, dummybuf, 0, 1);
- scgp->silent--;
+ usalp->silent++;
+ (*rfunc)(usalp, rp, dummybuf, 0, 1);
+ usalp->silent--;
} else {
fprintf(stderr, "~"); /* Read random sector */
- scgp->silent++;
- (*rfunc)(scgp, rp, dummybuf, choice(scgp->cap->c_baddr), 1);
- scgp->silent--;
+ usalp->silent++;
+ (*rfunc)(usalp, rp, dummybuf, choice(usalp->cap->c_baddr), 1);
+ usalp->silent--;
}
if (didintr)
comexit(exsig); /* XXX besseres Konzept?!*/
- wait_unit_ready(scgp, 120);
+ wait_unit_ready(usalp, 120);
}
if (didintr)
comexit(exsig); /* XXX besseres Konzept?!*/
fillbytes(bp, secsize, 0);
- scgp->silent++;
- err = (*rfunc)(scgp, rp, bp, addr, 1);
- scgp->silent--;
+ usalp->silent++;
+ err = (*rfunc)(usalp, rp, bp, addr, 1);
+ usalp->silent--;
if (err < 0) {
- err = scgp->scmd->ux_errno;
+ err = usalp->scmd->ux_errno;
/* fprintf(stderr, "\n");*/
/* errmsgno(err, "Cannot read source disk\n");*/
} else {
- if (scg_getresid(scgp)) {
- fprintf(stderr, "\nresid: %d\n", scg_getresid(scgp));
+ if (usal_getresid(usalp)) {
+ fprintf(stderr, "\nresid: %d\n", usal_getresid(usalp));
return (-1);
}
break;
@@ -1513,8 +1513,8 @@
errmsgno(err, "Error on sector %ld not corrected. Total of %d errors.\n",
addr, ++rp->errors);
- if (scgp->silent <= 1 && lverbose > 0)
- scg_printerr(scgp);
+ if (usalp->silent <= 1 && lverbose > 0)
+ usal_printerr(usalp);
add_bad(addr);
@@ -1541,8 +1541,8 @@
}
static void
-read_generic(SCSI *scgp, parm_t *parmp,
- int (*rfunc)(SCSI *scgp, rparm_t *rp, caddr_t bp, long addr, int cnt),
+read_generic(SCSI *usalp, parm_t *parmp,
+ int (*rfunc)(SCSI *usalp, rparm_t *rp, caddr_t bp, long addr, int cnt),
rparm_t *rp,
int (*dfunc)(rparm_t *rp, caddr_t bp, long addr, int cnt))
{
@@ -1567,7 +1567,7 @@
int i = 0;
if (is_suid) {
- if (scgp->inq->type != INQ_ROMD)
+ if (usalp->inq->type != INQ_ROMD)
comerrno(EX_BAD, "Not root. Will only read from CD in suid/priv mode\n");
}
@@ -1578,12 +1578,12 @@
filename[0] = '\0';
- scgp->silent++;
- if (read_capacity(scgp) >= 0)
- end = scgp->cap->c_baddr + 1;
- scgp->silent--;
+ usalp->silent++;
+ if (read_capacity(usalp) >= 0)
+ end = usalp->cap->c_baddr + 1;
+ usalp->silent--;
- if ((end <= 0 && isrange) || (askrange && scg_yes("Ignore disk size? ")))
+ if ((end <= 0 && isrange) || (askrange && usal_yes("Ignore disk size? ")))
end = 10000000; /* Hack to read empty (e.g. blank=fast) disks */
if (parmp) {
@@ -1591,7 +1591,7 @@
defname = parmp->name;
if (defname != NULL) {
fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file '%s'\n",
- scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp),
+ usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp),
defname);
}
@@ -1604,7 +1604,7 @@
if (defname == NULL) {
defname = "disk.out";
fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n",
- scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
+ usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
fprintf(stderr, "Enter filename [%s]: ", defname); flush();
(void) getline(filename, sizeof (filename));
}
@@ -1687,23 +1687,23 @@
}
fprintf(stderr, "addr: %8ld cnt: %ld\r", addr, cnt);
- scgp->silent++;
- if ((*rfunc)(scgp, rp, Sbuf, addr, cnt) < 0) {
- scgp->silent--;
- err = scgp->scmd->ux_errno;
+ usalp->silent++;
+ if ((*rfunc)(usalp, rp, Sbuf, addr, cnt) < 0) {
+ usalp->silent--;
+ err = usalp->scmd->ux_errno;
if (quiet) {
fprintf(stderr, "\n");
- } else if (scgp->silent == 0) {
- scg_printerr(scgp);
+ } else if (usalp->silent == 0) {
+ usal_printerr(usalp);
}
errmsgno(err, "Cannot read source disk\n");
- if (read_retry(scgp, Sbuf, addr, cnt, rfunc, rp) < 0)
+ if (read_retry(usalp, Sbuf, addr, cnt, rfunc, rp) < 0)
goto out;
} else {
- scgp->silent--;
- if (scg_getresid(scgp)) {
- fprintf(stderr, "\nresid: %d\n", scg_getresid(scgp));
+ usalp->silent--;
+ if (usal_getresid(usalp)) {
+ fprintf(stderr, "\nresid: %d\n", usal_getresid(usalp));
goto out;
}
}
@@ -1723,8 +1723,8 @@
msec = 1;
#ifdef OOO
fprintf(stderr, "Read %.2f kB at %.1f kB/sec.\n",
- (double)(addr - start)/(1024.0/scgp->cap->c_bsize),
- (double)((addr - start)/(1024.0/scgp->cap->c_bsize)) / (0.001*msec));
+ (double)(addr - start)/(1024.0/usalp->cap->c_bsize),
+ (double)((addr - start)/(1024.0/usalp->cap->c_bsize)) / (0.001*msec));
#else
fprintf(stderr, "Read %.2f kB at %.1f kB/sec.\n",
(double)(addr - start)/(1024.0/secsize),
@@ -1734,7 +1734,7 @@
}
static void
-write_disk(SCSI *scgp, parm_t *parmp)
+write_disk(SCSI *usalp, parm_t *parmp)
{
char filename[512];
char *defname = "disk.out";
@@ -1750,9 +1750,9 @@
comerrno(EX_BAD, "Not root. Will not write in suid/priv mode\n");
filename[0] = '\0';
- if (read_capacity(scgp) >= 0) {
- end = scgp->cap->c_baddr + 1;
- print_capacity(scgp, stderr);
+ if (read_capacity(usalp) >= 0) {
+ end = usalp->cap->c_baddr + 1;
+ print_capacity(usalp, stderr);
}
if (end <= 1)
@@ -1763,15 +1763,15 @@
defname = parmp->name;
fprintf(stderr, "Copy from file '%s' to SCSI (%d,%d,%d) disk\n",
defname,
- scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
+ usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
addr = start = parmp->start;
if (parmp->end != -1 && parmp->end < end)
end = parmp->end;
- cnt = Sbufsize / scgp->cap->c_bsize;
+ cnt = Sbufsize / usalp->cap->c_bsize;
} else {
fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n",
- scg_scsibus(scgp), scg_target(scgp), scg_lun(scgp));
+ usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
fprintf(stderr, "Enter filename [%s]: ", defname); flush();
(void) getline(filename, sizeof (filename));
fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n");
@@ -1782,7 +1782,7 @@
getlong("Enter number of sectors to copy:", &end, 1L, end);
end = addr + cnt;
- cnt = Sbufsize / scgp->cap->c_bsize;
+ cnt = Sbufsize / usalp->cap->c_bsize;
getlong("Enter number of sectors per copy:", &cnt, 1L, cnt);
/* fprintf(stderr, "end: %8ld\n", end);*/
}
@@ -1811,14 +1811,14 @@
fprintf(stderr, "addr: %8ld cnt: %ld\r", addr, cnt);
- if ((amt = fileread(f, Sbuf, cnt * scgp->cap->c_bsize)) < 0)
+ if ((amt = fileread(f, Sbuf, cnt * usalp->cap->c_bsize)) < 0)
comerr("Cannot read '%s'\n", filename);
if (amt == 0)
break;
- if ((amt / scgp->cap->c_bsize) < cnt)
- cnt = amt / scgp->cap->c_bsize;
- if (write_scsi(scgp, Sbuf, addr, cnt) < 0)
- comerrno(scgp->scmd->ux_errno,
+ if ((amt / usalp->cap->c_bsize) < cnt)
+ cnt = amt / usalp->cap->c_bsize;
+ if (write_scsi(usalp, Sbuf, addr, cnt) < 0)
+ comerrno(usalp->scmd->ux_errno,
"Cannot write destination disk\n");
}
fprintf(stderr, "addr: %8ld\n", addr);
@@ -1826,8 +1826,8 @@
if (msec == 0) /* Avoid division by zero */
msec = 1;
fprintf(stderr, "Wrote %.2f kB at %.1f kB/sec.\n",
- (double)(addr - start)/(1024.0/scgp->cap->c_bsize),
- (double)((addr - start)/(1024.0/scgp->cap->c_bsize)) / (0.001*msec));
+ (double)(addr - start)/(1024.0/usalp->cap->c_bsize),
+ (double)((addr - start)/(1024.0/usalp->cap->c_bsize)) / (0.001*msec));
}
static int
@@ -1849,7 +1849,7 @@
}
static void
-ra(SCSI *scgp)
+ra(SCSI *usalp)
{
/* char filename[512];*/
FILE *f;
@@ -1860,14 +1860,14 @@
/* int start;*/
/* int err = 0;*/
- select_secsize(scgp, 2352);
- read_capacity(scgp);
- print_capacity(scgp, stderr);
+ select_secsize(usalp, 2352);
+ read_capacity(usalp);
+ print_capacity(usalp, stderr);
fillbytes(Sbuf, 50*2352, 0);
- if (read_g1(scgp, Sbuf, 0, 50) < 0)
+ if (read_g1(usalp, Sbuf, 0, 50) < 0)
errmsg("read CD\n");
f = fileopen("DDA", "wctb");
-/* filewrite(f, Sbuf, 50 * 2352 - scg_getresid(scgp));*/
+/* filewrite(f, Sbuf, 50 * 2352 - usal_getresid(usalp));*/
filewrite(f, Sbuf, 50 * 2352);
fclose(f);
}
@@ -1877,11 +1877,11 @@
(cdb)->count[2] = (len) & 0xFF)
int
-read_da(SCSI *scgp, caddr_t bp, long addr, int cnt, int framesize, int subcode)
+read_da(SCSI *usalp, caddr_t bp, long addr, int cnt, int framesize, int subcode)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
- if (scgp->cap->c_bsize <= 0)
+ if (usalp->cap->c_bsize <= 0)
raisecond("capacity_not_set", 0L);
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
@@ -1891,21 +1891,21 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xd8;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
g5_cdbaddr(&scmd->cdb.g5_cdb, addr);
g5_cdblen(&scmd->cdb.g5_cdb, cnt);
scmd->cdb.g5_cdb.res10 = subcode;
- scgp->cmdname = "read_da";
+ usalp->cmdname = "read_da";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
int
-read_cd(SCSI *scgp, caddr_t bp, long addr, int cnt, int framesize, int data,
+read_cd(SCSI *usalp, caddr_t bp, long addr, int cnt, int framesize, int data,
int subch)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -1914,7 +1914,7 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xBE;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g5_cdb.res = 0; /* expected sector type field ALL */
g5_cdbaddr(&scmd->cdb.g5_cdb, addr);
g5x_cdblen(&scmd->cdb.g5_cdb, cnt);
@@ -1922,13 +1922,13 @@
scmd->cdb.g5_cdb.count[3] = data & 0xFF;
scmd->cdb.g5_cdb.res10 = subch & 0x07;
- scgp->cmdname = "read_cd";
+ usalp->cmdname = "read_cd";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
static void
-oldmode(SCSI *scgp, int *errp, int *retrp)
+oldmode(SCSI *usalp, int *errp, int *retrp)
{
Uchar mode[0x100];
Uchar cmode[0x100];
@@ -1939,12 +1939,12 @@
fillbytes(mode, sizeof (mode), '\0');
fillbytes(cmode, sizeof (cmode), '\0');
- if (!get_mode_params(scgp, 0x01, "CD error recovery parameter",
+ if (!get_mode_params(usalp, 0x01, "CD error recovery parameter",
mode, (Uchar *)0, (Uchar *)cmode, (Uchar *)0, &len)) {
return;
}
if (xdebug)
- scg_prbytes("Mode Sense Data", mode, len);
+ usal_prbytes("Mode Sense Data", mode, len);
mode[0] = 0;
mode[2] = 0; /* ??? ist manchmal 0x80 */
@@ -1953,7 +1953,7 @@
*p &= 0x3F;
if (xdebug)
- scg_prbytes("Mode page 1:", p, 0x10);
+ usal_prbytes("Mode page 1:", p, 0x10);
i = p[2];
if (errp != NULL)
@@ -1965,7 +1965,7 @@
}
static void
-domode(SCSI *scgp, int err, int retr)
+domode(SCSI *usalp, int err, int retr)
{
Uchar mode[0x100];
Uchar cmode[0x100];
@@ -1976,12 +1976,12 @@
fillbytes(mode, sizeof (mode), '\0');
fillbytes(cmode, sizeof (cmode), '\0');
- if (!get_mode_params(scgp, 0x01, "CD error recovery parameter",
+ if (!get_mode_params(usalp, 0x01, "CD error recovery parameter",
mode, (Uchar *)0, (Uchar *)cmode, (Uchar *)0, &len)) {
return;
}
if (xdebug || (err == -1 && retr == -1)) {
- scg_prbytes("Mode Sense Data", mode, len);
+ usal_prbytes("Mode Sense Data", mode, len);
}
mode[0] = 0;
@@ -1991,7 +1991,7 @@
*p &= 0x3F;
if (xdebug || (err == -1 && retr == -1))
- scg_prbytes("Mode page 1:", p, 0x10);
+ usal_prbytes("Mode page 1:", p, 0x10);
i = p[2];
if (err == -1) {
@@ -2016,8 +2016,8 @@
}
if (xdebug || (err == -1 && retr == -1))
- scg_prbytes("Mode Select Data", mode, len);
- mode_select(scgp, mode, len, 0, scgp->inq->data_format >= 2);
+ usal_prbytes("Mode Select Data", mode, len);
+ mode_select(usalp, mode, len, 0, usalp->inq->data_format >= 2);
}
@@ -2089,14 +2089,14 @@
/*--------------------------------------------------------------------------*/
static void
-ovtime(SCSI *scgp)
+ovtime(SCSI *usalp)
{
register int i;
- scgp->silent++;
- (void) test_unit_ready(scgp);
- scgp->silent--;
- if (test_unit_ready(scgp) < 0)
+ usalp->silent++;
+ (void) test_unit_ready(usalp);
+ usalp->silent--;
+ if (test_unit_ready(usalp) < 0)
return;
printf("Doing 1000 'TEST UNIT READY' operations.\n");
@@ -2105,7 +2105,7 @@
comerr("Cannot get start time\n");
for (i = 1000; --i >= 0; ) {
- (void) test_unit_ready(scgp);
+ (void) test_unit_ready(usalp);
if (didintr)
return;
@@ -2116,9 +2116,9 @@
/*
* ATAPI drives do not like seek_g0()
*/
- scgp->silent++;
- i = seek_g0(scgp, 0L);
- scgp->silent--;
+ usalp->silent++;
+ i = seek_g0(usalp, 0L);
+ usalp->silent--;
if (i >= 0) {
printf("Doing 1000 'SEEK_G0 (0)' operations.\n");
@@ -2127,7 +2127,7 @@
comerr("Cannot get start time\n");
for (i = 1000; --i >= 0; ) {
- (void) seek_g0(scgp, 0L);
+ (void) seek_g0(usalp, 0L);
if (didintr)
return;
@@ -2136,9 +2136,9 @@
prstats();
}
- scgp->silent++;
- i = seek_g1(scgp, 0L);
- scgp->silent--;
+ usalp->silent++;
+ i = seek_g1(usalp, 0L);
+ usalp->silent--;
if (i < 0)
return;
@@ -2148,7 +2148,7 @@
comerr("Cannot get start time\n");
for (i = 1000; --i >= 0; ) {
- (void) seek_g1(scgp, 0L);
+ (void) seek_g1(usalp, 0L);
if (didintr)
return;
Modified: cdrkit/trunk/rscsi/CMakeLists.txt
===================================================================
--- cdrkit/trunk/rscsi/CMakeLists.txt 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/rscsi/CMakeLists.txt 2006-11-23 18:57:28 UTC (rev 430)
@@ -3,7 +3,7 @@
INCLUDE(../include/AddScgBits.cmake)
INCLUDE(../include/AddSchilyBits.cmake)
-LINK_DIRECTORIES(../libschily ../libscg ../libdeflt)
+LINK_DIRECTORIES(../libschily ../libusal ../libdeflt)
ADD_EXECUTABLE (rscsi rscsi.c)
#SET_SOURCE_FILES_PROPERTIES(rscsi.c )
TARGET_LINK_LIBRARIES(rscsi ${EXTRA_LIBS} deflt)
Modified: cdrkit/trunk/rscsi/rscsi.c
===================================================================
--- cdrkit/trunk/rscsi/rscsi.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/rscsi/rscsi.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -61,8 +61,8 @@
#include <patmatch.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsitransp.h>
#include <netinet/in.h>
#ifdef HAVE_ARPA_INET_H
@@ -381,11 +381,11 @@
continue;
DEBUG6("ACCESS %s %s %d.%d,%d,%d\n", user, host, bus, chan, tgt, lun);
- if (bus != -1 && bus != scg_scsibus(scsi_ptr))
+ if (bus != -1 && bus != usal_scsibus(scsi_ptr))
continue;
- if (tgt != -1 && tgt != scg_target(scsi_ptr))
+ if (tgt != -1 && tgt != usal_target(scsi_ptr))
continue;
- if (lun != -1 && lun != scg_lun(scsi_ptr))
+ if (lun != -1 && lun != usal_lun(scsi_ptr))
continue;
return (TRUE);
}
@@ -497,7 +497,7 @@
rscsirespond(-1, EBADF);
return;
}
- str = scg_version(scsi_ptr, atoi(what));
+ str = usal_version(scsi_ptr, atoi(what));
ret = strlen(str);
ret++; /* Include null char */
rscsirespond(ret, geterrno());
@@ -515,7 +515,7 @@
char rbuf[1600];
if (scsi_ptr != NULL)
- (void) scg_close(scsi_ptr);
+ (void) usal_close(scsi_ptr);
readarg(device, sizeof(device));
DEBUG1("rscsid: O %s\n", device);
@@ -526,7 +526,7 @@
scsi_ptr = NULL;
seterrno(EACCES);
} else {
- scsi_ptr = scg_open(device, errstr, sizeof(errstr), debug, lverbose);
+ scsi_ptr = usal_open(device, errstr, sizeof(errstr), debug, lverbose);
if (scsi_ptr == NULL) {
ret = -1;
} else {
@@ -546,16 +546,16 @@
return;
}
DEBUG4("rscsid:>A 0 %d.%d,%d,%d\n",
- scg_scsibus(scsi_ptr),
+ usal_scsibus(scsi_ptr),
0,
- scg_target(scsi_ptr),
- scg_lun(scsi_ptr));
+ usal_target(scsi_ptr),
+ usal_lun(scsi_ptr));
ret = js_snprintf(rbuf, sizeof(rbuf), "A0\n%d\n%d\n%d\n%d\n",
- scg_scsibus(scsi_ptr),
+ usal_scsibus(scsi_ptr),
0,
- scg_target(scsi_ptr),
- scg_lun(scsi_ptr));
+ usal_target(scsi_ptr),
+ usal_lun(scsi_ptr));
(void) _nixwrite(STDOUT_FILENO, rbuf, ret);
}
@@ -567,7 +567,7 @@
readarg(device, sizeof(device));
DEBUG1("rscsid: C %s\n", device);
- ret = scg_close(scsi_ptr);
+ ret = usal_close(scsi_ptr);
rscsirespond(ret, geterrno());
scsi_ptr = NULL;
}
@@ -584,7 +584,7 @@
rscsirespond(-1, EBADF);
return;
}
- ret = scg_bufsize(scsi_ptr, atol(amt));
+ ret = usal_bufsize(scsi_ptr, atol(amt));
rscsirespond(ret, geterrno());
}
@@ -600,7 +600,7 @@
rscsirespond(-1, EBADF);
return;
}
- ret = scg_bufsize(scsi_ptr, atol(amt));
+ ret = usal_bufsize(scsi_ptr, atol(amt));
if (preparebuffer(ret) == NULL)
ret = -1;
rscsirespond(ret, geterrno());
@@ -618,7 +618,7 @@
rscsirespond(-1, EBADF);
return;
}
- scg_freebuf(scsi_ptr);
+ usal_freebuf(scsi_ptr);
Sbuf = NULL;
rscsirespond(ret, geterrno());
}
@@ -637,7 +637,7 @@
rscsirespond(-1, EBADF);
return;
}
- ret = scg_havebus(scsi_ptr, atol(bus));
+ ret = usal_havebus(scsi_ptr, atol(bus));
rscsirespond(ret, geterrno());
}
@@ -660,9 +660,9 @@
return;
}
seterrno(0);
- ret = scg_settarget(scsi_ptr, atoi(bus), atoi(tgt), atoi(lun));
+ ret = usal_settarget(scsi_ptr, atoi(bus), atoi(tgt), atoi(lun));
if (!checktarget()) {
- scg_settarget(scsi_ptr, -1, -1, -1);
+ usal_settarget(scsi_ptr, -1, -1, -1);
ret = -1;
}
if (geterrno() != 0)
@@ -684,7 +684,7 @@
return;
}
seterrno(0);
- ret = scg_initiator_id(scsi_ptr);
+ ret = usal_initiator_id(scsi_ptr);
if (geterrno() != 0)
rscsirespond(ret, geterrno());
else
@@ -704,7 +704,7 @@
return;
}
seterrno(0);
- ret = scg_isatapi(scsi_ptr);
+ ret = usal_isatapi(scsi_ptr);
if (geterrno() != 0)
rscsirespond(ret, geterrno());
else
@@ -723,14 +723,14 @@
rscsirespond(-1, EBADF);
return;
}
- ret = scg_reset(scsi_ptr, atoi(what));
+ ret = usal_reset(scsi_ptr, atoi(what));
rscsirespond(ret, geterrno());
}
static void
sendcmd()
{
- register struct scg_cmd *scmd;
+ register struct usal_cmd *scmd;
int n;
int ret;
char count[CMD_SIZE];
@@ -803,7 +803,7 @@
scsi_ptr->cmdname = "";
- ret = scg_cmd(scsi_ptr);
+ ret = usal_cmd(scsi_ptr);
n = 0;
if ((csize - scmd->resid) > 0)
@@ -932,7 +932,7 @@
preparebuffer(int size)
{
Sbufsize = size;
- if ((Sbuf = scg_getbuf(scsi_ptr, Sbufsize)) == NULL) {
+ if ((Sbuf = usal_getbuf(scsi_ptr, Sbufsize)) == NULL) {
Sbufsize = 0L;
return (Sbuf);
}
Modified: cdrkit/trunk/wodim/CMakeLists.txt
===================================================================
--- cdrkit/trunk/wodim/CMakeLists.txt 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/CMakeLists.txt 2006-11-23 18:57:28 UTC (rev 430)
@@ -14,7 +14,7 @@
MESSAGE(FATAL_ERROR "Error: found a Linux system but no libcap header. Install libcap-dev.")
endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CAPTEST)
-LINK_DIRECTORIES(../libschily ../libscg ../libdeflt ../libedc)
+LINK_DIRECTORIES(../libschily ../libusal ../libdeflt ../libedc)
ADD_DEFINITIONS(-DHAVE_LIB_EDC_ECC -DCLONE_WRITE)
Modified: cdrkit/trunk/wodim/audiosize.c
===================================================================
--- cdrkit/trunk/wodim/audiosize.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/audiosize.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -45,7 +45,7 @@
#include <intcvt.h>
#include <schily.h>
-#include <scg/scgcmd.h>
+#include <usal/usalcmd.h>
#include "auheader.h"
typedef struct {
Modified: cdrkit/trunk/wodim/cdr_drv.c
===================================================================
--- cdrkit/trunk/wodim/cdr_drv.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/cdr_drv.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -42,9 +42,9 @@
#include <standard.h>
#include <schily.h>
-#include <scg/scsidefs.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/scsidefs.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include "wodim.h"
@@ -73,18 +73,18 @@
extern cdr_t cdr_cdr_simul;
extern cdr_t cdr_dvd_simul;
-cdr_t *drive_identify(SCSI *scgp, cdr_t *, struct scsi_inquiry *ip);
-int drive_attach(SCSI *scgp, cdr_t *);
+cdr_t *drive_identify(SCSI *usalp, cdr_t *, struct scsi_inquiry *ip);
+int drive_attach(SCSI *usalp, cdr_t *);
int attach_unknown(void);
-int blank_dummy(SCSI *scgp, cdr_t *, long addr, int blanktype);
-int format_dummy(SCSI *scgp, cdr_t *, int fmtflags);
-int drive_getdisktype(SCSI *scgp, cdr_t *dp);
-int cmd_ill(SCSI *scgp);
-int cmd_dummy(SCSI *scgp, cdr_t *);
-int no_sendcue(SCSI *scgp, cdr_t *, track_t *trackp);
-int buf_dummy(SCSI *scgp, long *sp, long *fp);
+int blank_dummy(SCSI *usalp, cdr_t *, long addr, int blanktype);
+int format_dummy(SCSI *usalp, cdr_t *, int fmtflags);
+int drive_getdisktype(SCSI *usalp, cdr_t *dp);
+int cmd_ill(SCSI *usalp);
+int cmd_dummy(SCSI *usalp, cdr_t *);
+int no_sendcue(SCSI *usalp, cdr_t *, track_t *trackp);
+int buf_dummy(SCSI *usalp, long *sp, long *fp);
BOOL set_cdrcmds(char *name, cdr_t **dpp);
-cdr_t *get_cdrcmds(SCSI *scgp);
+cdr_t *get_cdrcmds(SCSI *usalp);
/*
* List of CD-R drivers
@@ -116,13 +116,13 @@
};
cdr_t *
-drive_identify(SCSI *scgp, cdr_t *dp, struct scsi_inquiry *ip)
+drive_identify(SCSI *usalp, cdr_t *dp, struct scsi_inquiry *ip)
{
return (dp);
}
int
-drive_attach(SCSI *scgp, cdr_t *dp)
+drive_attach(SCSI *usalp, cdr_t *dp)
{
return (0);
}
@@ -135,48 +135,48 @@
}
int
-blank_dummy(SCSI *scgp, cdr_t *dp, long addr, int blanktype)
+blank_dummy(SCSI *usalp, cdr_t *dp, long addr, int blanktype)
{
printf("This drive or media does not support the 'BLANK media' command\n");
return (-1);
}
int
-format_dummy(SCSI *scgp, cdr_t *dp, int fmtflags)
+format_dummy(SCSI *usalp, cdr_t *dp, int fmtflags)
{
printf("This drive or media does not support the 'FORMAT media' command\n");
return (-1);
}
int
-drive_getdisktype(SCSI *scgp, cdr_t *dp)
+drive_getdisktype(SCSI *usalp, cdr_t *dp)
{
/* dstat_t *dsp = dp->cdr_dstat;*/
return (0);
}
int
-cmd_ill(SCSI *scgp)
+cmd_ill(SCSI *usalp)
{
errmsgno(EX_BAD, "Unspecified command not implemented for this drive.\n");
return (-1);
}
int
-cmd_dummy(SCSI *scgp, cdr_t *dp)
+cmd_dummy(SCSI *usalp, cdr_t *dp)
{
return (0);
}
int
-no_sendcue(SCSI *scgp, cdr_t *dp, track_t *trackp)
+no_sendcue(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
errmsgno(EX_BAD, "SAO writing not available or not implemented for this drive.\n");
return (-1);
}
int
-buf_dummy(SCSI *scgp, long *sp, long *fp)
+buf_dummy(SCSI *usalp, long *sp, long *fp)
{
return (-1);
}
@@ -215,7 +215,7 @@
}
cdr_t *
-get_cdrcmds(SCSI *scgp)
+get_cdrcmds(SCSI *usalp)
{
cdr_t *dp = (cdr_t *)0;
cdr_t *odp = (cdr_t *)0;
@@ -232,10 +232,10 @@
/*
* First check for SCSI-3/mmc-3 drives.
*/
- if (get_proflist(scgp, &is_wr, &is_cd, &is_dvd,
+ if (get_proflist(usalp, &is_wr, &is_cd, &is_dvd,
&is_dvdplus, &is_ddcd) >= 0) {
- get_wproflist(scgp, &is_cdwr, &is_dvdwr,
+ get_wproflist(usalp, &is_cdwr, &is_dvdwr,
&is_dvdpluswr, &is_ddcdwr);
if (xdebug) {
fprintf(stderr,
@@ -259,7 +259,7 @@
/*
* First check for SCSI-3/mmc drives.
*/
- if (is_mmc(scgp, &is_cdwr, &is_dvdwr)) {
+ if (is_mmc(usalp, &is_cdwr, &is_dvdwr)) {
if (xdebug) {
fprintf(stderr, "Found MMC drive CDWR: %d DVDWR: %d.\n",
is_cdwr, is_dvdwr);
@@ -270,7 +270,7 @@
else
dp = &cdr_mmc;
- } else switch (scgp->dev) {
+ } else switch (usalp->dev) {
case DEV_CDROM: dp = &cdr_oldcd; break;
case DEV_MMC_CDROM: dp = &cdr_cd; break;
@@ -309,7 +309,7 @@
}
if (dp != (cdr_t *)0)
- dp = dp->cdr_identify(scgp, dp, scgp->inq);
+ dp = dp->cdr_identify(usalp, dp, usalp->inq);
if (xdebug && dp != odp) {
fprintf(stderr, "Identify set driver to '%s'.\n",
Modified: cdrkit/trunk/wodim/cdtext.c
===================================================================
--- cdrkit/trunk/wodim/cdtext.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/cdtext.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -44,7 +44,7 @@
#include <strdefs.h>
#include <schily.h>
-#include <scg/scsitransp.h> /* For write_leadin() */
+#include <usal/scsitransp.h> /* For write_leadin() */
#include "cdtext.h"
#include "wodim.h"
@@ -127,7 +127,7 @@
static BOOL anytext(int pack_type, int tracks, track_t *trackp);
static void fillup_pack(txtarg_t *ap);
static void fillpacks(txtarg_t *ap, char *from, int len, int track_no, int pack_type);
-int write_cdtext(SCSI *scgp, cdr_t *dp, long startsec);
+int write_cdtext(SCSI *usalp, cdr_t *dp, long startsec);
static void eight2six(Uchar *in, Uchar *out);
static void six2eight(Uchar *in, Uchar *out);
@@ -441,7 +441,7 @@
ap->p = p;
}
-int write_cdtext(SCSI *scgp, cdr_t *dp, long startsec)
+int write_cdtext(SCSI *usalp, cdr_t *dp, long startsec)
{
char *bp = (char *)textsub;
int buflen = textlen;
@@ -450,7 +450,7 @@
long end = -150;
int secspt = textlen / 96;
int bytespt = textlen;
- long maxdma = scgp->maxbuf;
+ long maxdma = usalp->maxbuf;
int idx;
int secs;
int nbytes;
@@ -461,7 +461,7 @@
* Try to make each CD-Text transfer use as much data
* as possible.
*/
- bp = scgp->bufptr;
+ bp = usalp->bufptr;
for (idx = 0; (idx + textlen) <= maxdma; idx += textlen)
movebytes(textsub, &bp[idx], textlen);
buflen = idx;
@@ -491,7 +491,7 @@
}
/*printf("idx: %d nbytes: %d secs: %d startsec: %ld\n",*/
/*idx, nbytes, secs, startsec);*/
- amount = write_secs(scgp, dp,
+ amount = write_secs(usalp, dp,
(char *)&bp[idx], startsec, nbytes, secs, FALSE);
if (amount < 0) {
printf("write CD-Text data: error after %ld bytes\n",
Modified: cdrkit/trunk/wodim/clone.c
===================================================================
--- cdrkit/trunk/wodim/clone.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/clone.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -45,13 +45,13 @@
#include <utypes.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsitransp.h>
#include "wodim.h"
#include "crc16.h"
-#include <scg/scsireg.h>
+#include <usal/scsireg.h>
#include "scsimmc.h"
/*#define SAO_RAW*/
@@ -120,7 +120,7 @@
for (i = 4, j = 0; i < len; i += 11) {
fp = (struct ftrackdesc *)&buf[i];
if (xdebug)
- scg_prbytes("FT", (Uchar *)&buf[i], 11);
+ usal_prbytes("FT", (Uchar *)&buf[i], 11);
if (fp->sess_number != 1)
comerrno(EX_BAD, "Can only copy session # 1.\n");
@@ -177,7 +177,7 @@
_subq[j][9] = mr.msf_frame;
}
if (xdebug)
- scg_prbytes("TOC ", _subq[j], 12);
+ usal_prbytes("TOC ", _subq[j], 12);
j++;
}
_nsubh = j;
Modified: cdrkit/trunk/wodim/drv_7501.c
===================================================================
--- cdrkit/trunk/wodim/drv_7501.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/drv_7501.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -64,10 +64,10 @@
#include <intcvt.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsidefs.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsidefs.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include <libport.h>
@@ -225,31 +225,31 @@
};
-static int cw7501_attach(SCSI *scgp, cdr_t *dp);
-static int cw7501_init(SCSI *scgp, cdr_t *dp);
-static int cw7501_getdisktype(SCSI *scgp, cdr_t *dp);
-static int cw7501_speed_select(SCSI *scgp, cdr_t *dp, int *speedp);
-static int cw7501_next_wr_addr(SCSI *scgp, track_t *trackp, long *ap);
-static int cw7501_write(SCSI *scgp, caddr_t bp, long sectaddr, long size,
+static int cw7501_attach(SCSI *usalp, cdr_t *dp);
+static int cw7501_init(SCSI *usalp, cdr_t *dp);
+static int cw7501_getdisktype(SCSI *usalp, cdr_t *dp);
+static int cw7501_speed_select(SCSI *usalp, cdr_t *dp, int *speedp);
+static int cw7501_next_wr_addr(SCSI *usalp, track_t *trackp, long *ap);
+static int cw7501_write(SCSI *usalp, caddr_t bp, long sectaddr, long size,
int blocks, BOOL islast);
-static int cw7501_write_leadin(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int cw7501_open_track(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int cw7501_close_track(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int cw7501_open_session(SCSI *scgp, cdr_t *dp, track_t *trackp);
+static int cw7501_write_leadin(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int cw7501_open_track(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int cw7501_close_track(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int cw7501_open_session(SCSI *usalp, cdr_t *dp, track_t *trackp);
static int cw7501_gen_cue(track_t *trackp, void *vcuep, BOOL needgap);
static void fillcue(struct cw7501_cue *cp, int ca, int tno, int idx,
int dataform, int scms, msf_t *mp);
-static int cw7501_send_cue(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int cw7501_fixate(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int cw7501_rezero(SCSI *scgp, int reset, int dwreset);
-static int cw7501_read_trackinfo(SCSI *scgp, Uchar *bp, int count,
+static int cw7501_send_cue(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int cw7501_fixate(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int cw7501_rezero(SCSI *usalp, int reset, int dwreset);
+static int cw7501_read_trackinfo(SCSI *usalp, Uchar *bp, int count,
int track, int mode);
-static int cw7501_write_dao(SCSI *scgp, Uchar *bp, int len, int disktype);
-static int cw7501_reserve_track(SCSI *scgp, unsigned long);
-static int cw7501_set_mode(SCSI *scgp, int phys_form, int control,
+static int cw7501_write_dao(SCSI *usalp, Uchar *bp, int len, int disktype);
+static int cw7501_reserve_track(SCSI *usalp, unsigned long);
+static int cw7501_set_mode(SCSI *usalp, int phys_form, int control,
int subc, int alt, int trackno, int tindex,
int packet_size, int write_mode);
-static int cw7501_finalize(SCSI *scgp, int pad, int fixed);
+static int cw7501_finalize(SCSI *usalp, int pad, int fixed);
cdr_t cdr_cw7501 = {
@@ -332,20 +332,20 @@
};
static int
-cw7501_attach(SCSI *scgp, cdr_t *dp)
+cw7501_attach(SCSI *usalp, cdr_t *dp)
{
- scg_setnonstderrs(scgp, sd_cw7501_error_str);
+ usal_setnonstderrs(usalp, sd_cw7501_error_str);
return (0);
}
static int
-cw7501_init(SCSI *scgp, cdr_t *dp)
+cw7501_init(SCSI *usalp, cdr_t *dp)
{
- return (cw7501_speed_select(scgp, dp, NULL));
+ return (cw7501_speed_select(usalp, dp, NULL));
}
static int
-cw7501_getdisktype(SCSI *scgp, cdr_t *dp)
+cw7501_getdisktype(SCSI *usalp, cdr_t *dp)
{
Ulong maxb = 0;
Uchar buf[256];
@@ -353,33 +353,33 @@
dstat_t *dsp = dp->cdr_dstat;
if (xdebug > 0) {
- scgp->silent++;
+ usalp->silent++;
fillbytes((caddr_t)buf, sizeof (buf), '\0');
- ret = cw7501_read_trackinfo(scgp, buf, 32, 0, 0);
+ ret = cw7501_read_trackinfo(usalp, buf, 32, 0, 0);
if (ret >= 0)
- scg_prbytes("TI EXIST-R (0): ", buf, 32 -scg_getresid(scgp));
+ usal_prbytes("TI EXIST-R (0): ", buf, 32 -usal_getresid(usalp));
fillbytes((caddr_t)buf, sizeof (buf), '\0');
- ret = cw7501_read_trackinfo(scgp, buf, 32, 0, 1);
+ ret = cw7501_read_trackinfo(usalp, buf, 32, 0, 1);
if (ret >= 0)
- scg_prbytes("TI NWA (1): ", buf, 32 -scg_getresid(scgp));
+ usal_prbytes("TI NWA (1): ", buf, 32 -usal_getresid(usalp));
fillbytes((caddr_t)buf, sizeof (buf), '\0');
- ret = cw7501_read_trackinfo(scgp, buf, 32, 0, 2);
+ ret = cw7501_read_trackinfo(usalp, buf, 32, 0, 2);
if (ret >= 0)
- scg_prbytes("TI PMA (2): ", buf, 32 -scg_getresid(scgp));
+ usal_prbytes("TI PMA (2): ", buf, 32 -usal_getresid(usalp));
fillbytes((caddr_t)buf, sizeof (buf), '\0');
- ret = cw7501_read_trackinfo(scgp, buf, 32, 0, 3);
+ ret = cw7501_read_trackinfo(usalp, buf, 32, 0, 3);
if (ret >= 0)
- scg_prbytes("TI EXIST-ROM (3): ", buf, 32 -scg_getresid(scgp));
- scgp->silent--;
+ usal_prbytes("TI EXIST-ROM (3): ", buf, 32 -usal_getresid(usalp));
+ usalp->silent--;
}
fillbytes((caddr_t)buf, sizeof (buf), '\0');
- scgp->silent++;
- ret = cw7501_read_trackinfo(scgp, buf, 12, 0, TI_NWA);
+ usalp->silent++;
+ ret = cw7501_read_trackinfo(usalp, buf, 12, 0, TI_NWA);
if (ret < 0 &&
(dsp->ds_cdrflags & (RF_WRITE|RF_BLANK)) == RF_WRITE) {
@@ -390,11 +390,11 @@
*/
if (lverbose)
printf("Trying to clear drive status.\n");
- cw7501_rezero(scgp, 0, 1);
- wait_unit_ready(scgp, 60);
- ret = cw7501_read_trackinfo(scgp, buf, 12, 0, TI_NWA);
+ cw7501_rezero(usalp, 0, 1);
+ wait_unit_ready(usalp, 60);
+ ret = cw7501_read_trackinfo(usalp, buf, 12, 0, TI_NWA);
}
- scgp->silent--;
+ usalp->silent--;
if (ret >= 0) {
maxb = a_to_u_4_byte(&buf[8]);
@@ -403,12 +403,12 @@
}
dsp->ds_maxblocks = maxb;
- return (drive_getdisktype(scgp, dp));
+ return (drive_getdisktype(usalp, dp));
}
static int
-cw7501_speed_select(SCSI *scgp, cdr_t *dp, int *speedp)
+cw7501_speed_select(SCSI *usalp, cdr_t *dp, int *speedp)
{
struct scsi_mode_page_header *mp;
char mode[256];
@@ -425,7 +425,7 @@
} else {
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- if (!get_mode_params(scgp, page, "Speed information",
+ if (!get_mode_params(usalp, page, "Speed information",
(Uchar *)mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
return (-1);
}
@@ -449,7 +449,7 @@
md.pagex.page20.p_len = 0x02;
md.pagex.page20.speed = speed;
- if (mode_select(scgp, (Uchar *)&md, count, 0, scgp->inq->data_format >= 2) < 0)
+ if (mode_select(usalp, (Uchar *)&md, count, 0, usalp->inq->data_format >= 2) < 0)
return (-1);
fillbytes((caddr_t)&md, sizeof (md), '\0');
@@ -461,11 +461,11 @@
md.pagex.page23.p_len = 0x02;
md.pagex.page23.dummy = dummy?1:0;
- return (mode_select(scgp, (Uchar *)&md, count, 0, scgp->inq->data_format >= 2));
+ return (mode_select(usalp, (Uchar *)&md, count, 0, usalp->inq->data_format >= 2));
}
static int
-cw7501_next_wr_addr(SCSI *scgp, track_t *trackp, long *ap)
+cw7501_next_wr_addr(SCSI *usalp, track_t *trackp, long *ap)
{
struct cw7501_nwa *nwa;
Uchar buf[256];
@@ -483,21 +483,21 @@
if (trackp != 0 && trackp->track > 0 && is_packet(trackp)) {
fillbytes((caddr_t)buf, sizeof (buf), '\0');
- scgp->silent++;
- result = cw7501_read_trackinfo(scgp, buf, sizeof (*nwa),
+ usalp->silent++;
+ result = cw7501_read_trackinfo(usalp, buf, sizeof (*nwa),
trackp->trackno,
TI_NWA);
- scgp->silent--;
+ usalp->silent--;
}
if (result < 0) {
- if (cw7501_read_trackinfo(scgp, buf, sizeof (*nwa),
+ if (cw7501_read_trackinfo(usalp, buf, sizeof (*nwa),
0, TI_NWA) < 0)
return (-1);
}
- if (scgp->verbose)
- scg_prbytes("track info:", buf,
- 12-scg_getresid(scgp));
+ if (usalp->verbose)
+ usal_prbytes("track info:", buf,
+ 12-usal_getresid(usalp));
next_addr = a_to_4_byte(&nwa->nwa_nwa);
/*
* XXX Für TAO definitiv notwendig.
@@ -510,7 +510,7 @@
}
static int
-cw7501_write(SCSI *scgp,
+cw7501_write(SCSI *usalp,
caddr_t bp /* address of buffer */,
long sectaddr /* disk address (sector) to put */,
long size /* number of bytes to transfer */,
@@ -520,11 +520,11 @@
if (lverbose > 1 && islast)
printf("\nWriting last record for this track.\n");
- return (write_xg0(scgp, bp, 0, size, blocks));
+ return (write_xg0(usalp, bp, 0, size, blocks));
}
static int
-cw7501_write_leadin(SCSI *scgp, cdr_t *dp, track_t *trackp)
+cw7501_write_leadin(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
Uint i;
long startsec = 0L;
@@ -534,7 +534,7 @@
printf("Sending CUE sheet...\n");
flush();
}
- if ((*dp->cdr_send_cue)(scgp, dp, trackp) < 0) {
+ if ((*dp->cdr_send_cue)(usalp, dp, trackp) < 0) {
errmsgno(EX_BAD, "Cannot send CUE sheet.\n");
return (-1);
}
@@ -576,7 +576,7 @@
};
static int
-cw7501_open_track(SCSI *scgp, cdr_t *dp, track_t *trackp)
+cw7501_open_track(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
struct scsi_mode_page_header *mp;
Uchar mode[256];
@@ -594,7 +594,7 @@
/*
* XXX Do we need to check isecsize too?
*/
- pad_track(scgp, dp, trackp,
+ pad_track(usalp, dp, trackp,
trackp->trackstart-trackp->pregapsize,
(Llong)trackp->pregapsize*trackp->secsize,
FALSE, 0);
@@ -602,10 +602,10 @@
return (0);
}
- if (select_secsize(scgp, trackp->secsize) < 0)
+ if (select_secsize(usalp, trackp->secsize) < 0)
return (-1);
- if (!get_mode_params(scgp, page, "Dummy/autopg information",
+ if (!get_mode_params(usalp, page, "Dummy/autopg information",
(Uchar *)mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
return (-1);
}
@@ -618,13 +618,13 @@
xp23 = (struct cw7501_mode_page_23 *)mp;
xp23->autopg = 1;
- if (!set_mode_params(scgp, "Dummy/autopg page", mode, len, 0, trackp->secsize))
+ if (!set_mode_params(usalp, "Dummy/autopg page", mode, len, 0, trackp->secsize))
return (-1);
/*
* Set write modes for next track.
*/
- if (cw7501_set_mode(scgp, db2phys[trackp->dbtype & 0x0F],
+ if (cw7501_set_mode(usalp, db2phys[trackp->dbtype & 0x0F],
st2mode[trackp->sectype&ST_MASK] | (is_copy(trackp) ? TM_ALLOW_COPY : 0),
0, is_scms(trackp) ? 1 : 0,
trackp->trackno, 1, 0,
@@ -636,21 +636,21 @@
static int
-cw7501_close_track(SCSI *scgp, cdr_t *dp, track_t *trackp)
+cw7501_close_track(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
if (!is_tao(trackp) && !is_packet(trackp)) {
return (0);
}
- return (scsi_flush_cache(scgp, FALSE));
+ return (scsi_flush_cache(usalp, FALSE));
}
static int
-cw7501_open_session(SCSI *scgp, cdr_t *dp, track_t *trackp)
+cw7501_open_session(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
struct cw7501_mode_data md;
int count;
- if (select_secsize(scgp, 2048) < 0)
+ if (select_secsize(usalp, 2048) < 0)
return (-1);
/*
@@ -663,7 +663,7 @@
int page = 0x23;
struct cw7501_mode_page_23 *xp23;
- if (!get_mode_params(scgp, page, "Dummy/autopg information",
+ if (!get_mode_params(usalp, page, "Dummy/autopg information",
(Uchar *)mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
return (-1);
}
@@ -676,7 +676,7 @@
xp23 = (struct cw7501_mode_page_23 *)mp;
xp23->autopg = 0;
- if (!set_mode_params(scgp, "Dummy/autopg page", mode, len, 0, trackp->secsize))
+ if (!set_mode_params(usalp, "Dummy/autopg page", mode, len, 0, trackp->secsize))
return (-1);
return (0);
@@ -695,21 +695,21 @@
md.pagex.page24.disktype = toc2sess[track_base(trackp)->tracktype & TOC_MASK];
i_to_4_byte(&md.pagex.page24.disk_id, 0x12345);
- return (mode_select(scgp, (Uchar *)&md, count, 0, scgp->inq->data_format >= 2));
+ return (mode_select(usalp, (Uchar *)&md, count, 0, usalp->inq->data_format >= 2));
}
static int
-cw7501_fixate(SCSI *scgp, cdr_t *dp, track_t *trackp)
+cw7501_fixate(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
if (!is_tao(trackp) && !is_packet(trackp)) {
- return (scsi_flush_cache(scgp, FALSE));
+ return (scsi_flush_cache(usalp, FALSE));
}
/*
* 0x00 Finalize Disk (not appendable)
* 0x01 Finalize Session (allow next session)
* 0x10 Finalize track (variable packet writing) - Must fluch cache before
*/
- return (cw7501_finalize(scgp, 0, (track_base(trackp)->tracktype & TOCF_MULTI) ? 0x01 : 0x00));
+ return (cw7501_finalize(usalp, 0, (track_base(trackp)->tracktype & TOCF_MULTI) ? 0x01 : 0x00));
}
/*--------------------------------------------------------------------------*/
@@ -807,7 +807,7 @@
if (lverbose > 1) {
for (i = 0; i < ncue; i++) {
- scg_prbytes("", (Uchar *)&cue[i], 8);
+ usal_prbytes("", (Uchar *)&cue[i], 8);
}
}
if (cuep)
@@ -842,7 +842,7 @@
}
static int
-cw7501_send_cue(SCSI *scgp, cdr_t *dp, track_t *trackp)
+cw7501_send_cue(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
struct cw7501_cue *cp;
int ncue;
@@ -867,14 +867,14 @@
stoptime = starttime;
gettimeofday(&starttime, (struct timezone *)0);
- scgp->silent++;
- ret = cw7501_write_dao(scgp, (Uchar *)cp, ncue*8, disktype);
- scgp->silent--;
+ usalp->silent++;
+ ret = cw7501_write_dao(usalp, (Uchar *)cp, ncue*8, disktype);
+ usalp->silent--;
free(cp);
if (ret < 0) {
errmsgno(EX_BAD, "CUE sheet not accepted. Retrying with minimum pregapsize = 1.\n");
ncue = (*dp->cdr_gen_cue)(trackp, &cp, TRUE);
- ret = cw7501_write_dao(scgp, (Uchar *)cp, ncue*8, disktype);
+ ret = cw7501_write_dao(usalp, (Uchar *)cp, ncue*8, disktype);
free(cp);
}
if (ret >= 0 && lverbose) {
@@ -886,9 +886,9 @@
/*--------------------------------------------------------------------------*/
static int
-cw7501_rezero(SCSI *scgp, int reset, int dwreset)
+cw7501_rezero(SCSI *usalp, int reset, int dwreset)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)0;
@@ -897,20 +897,20 @@
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = SC_REZERO_UNIT;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
scmd->cdb.cmd_cdb[5] |= reset ? 0x80 : 0;
scmd->cdb.cmd_cdb[5] |= dwreset ? 0x40 : 0;
- scgp->cmdname = "cw7501 rezero";
+ usalp->cmdname = "cw7501 rezero";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
static int
-cw7501_read_trackinfo(SCSI *scgp, Uchar *bp, int count, int track, int mode)
+cw7501_read_trackinfo(SCSI *usalp, Uchar *bp, int count, int track, int mode)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t) scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)bp;
@@ -919,23 +919,23 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xE9;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.cmd_cdb[6] = track;
g1_cdblen(&scmd->cdb.g1_cdb, count);
scmd->cdb.cmd_cdb[9] = (mode & 3) << 6;
- scgp->cmdname = "cw7501 read_track_information";
+ usalp->cmdname = "cw7501 read_track_information";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-cw7501_write_dao(SCSI *scgp, Uchar *bp, int len, int disktype)
+cw7501_write_dao(SCSI *usalp, Uchar *bp, int len, int disktype)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)bp;
@@ -944,13 +944,13 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xE6;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.cmd_cdb[2] = disktype;
g1_cdblen(&scmd->cdb.g1_cdb, len);
- scgp->cmdname = "cw7501 write_dao";
+ usalp->cmdname = "cw7501 write_dao";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
@@ -960,41 +960,41 @@
* XXX driver interface.
*/
static int
-cw7501_reserve_track(SCSI *scgp, unsigned long len)
+cw7501_reserve_track(SCSI *usalp, unsigned long len)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xE7;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
/* scmd->cdb.cmd_cdb[2] = control & 0x0F;*/
i_to_4_byte(&scmd->cdb.cmd_cdb[5], len);
- scgp->cmdname = "cw7501 reserve_track";
+ usalp->cmdname = "cw7501 reserve_track";
comerrno(EX_BAD, "Control (as in set mode) missing.\n");
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-cw7501_set_mode(SCSI *scgp, int phys_form, int control, int subc,
+cw7501_set_mode(SCSI *usalp, int phys_form, int control, int subc,
int alt, int trackno, int tindex, int packet_size,
int write_mode)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xE2;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.cmd_cdb[2] = phys_form & 0x0F;
scmd->cdb.cmd_cdb[3] = (control & 0x0F) << 4;
scmd->cdb.cmd_cdb[3] |= subc ? 2 : 0;
@@ -1004,17 +1004,17 @@
i_to_3_byte(&scmd->cdb.cmd_cdb[6], packet_size);
scmd->cdb.cmd_cdb[9] = (write_mode & 0x03) << 6;
- scgp->cmdname = "cw7501 set_mode";
+ usalp->cmdname = "cw7501 set_mode";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-cw7501_finalize(SCSI *scgp, int pad, int fixed)
+cw7501_finalize(SCSI *usalp, int pad, int fixed)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
@@ -1022,13 +1022,13 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->timeout = 8 * 60; /* Needs up to 4 minutes */
scmd->cdb.g1_cdb.cmd = 0xE3;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.cmd_cdb[1] = pad ? 1 : 0;
scmd->cdb.cmd_cdb[8] = fixed & 0x03;
- scgp->cmdname = "cw7501 finalize";
+ usalp->cmdname = "cw7501 finalize";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
Modified: cdrkit/trunk/wodim/drv_jvc.c
===================================================================
--- cdrkit/trunk/wodim/drv_jvc.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/drv_jvc.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -55,10 +55,10 @@
#include <intcvt.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsidefs.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsidefs.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include "wodim.h"
@@ -220,41 +220,41 @@
#endif
-static int teac_attach(SCSI *scgp, cdr_t *dp);
-static int teac_init(SCSI *scgp, cdr_t *dp);
-static int teac_getdisktype(SCSI *scgp, cdr_t *dp);
-static int speed_select_teac(SCSI *scgp, cdr_t *dp, int *speedp);
-static int select_secsize_teac(SCSI *scgp, track_t *trackp);
-static int next_wr_addr_jvc(SCSI *scgp, track_t *, long *ap);
-static int write_teac_xg1(SCSI *scgp, caddr_t, long, long, int, BOOL);
-static int cdr_write_teac(SCSI *scgp, caddr_t bp, long sectaddr, long size,
+static int teac_attach(SCSI *usalp, cdr_t *dp);
+static int teac_init(SCSI *usalp, cdr_t *dp);
+static int teac_getdisktype(SCSI *usalp, cdr_t *dp);
+static int speed_select_teac(SCSI *usalp, cdr_t *dp, int *speedp);
+static int select_secsize_teac(SCSI *usalp, track_t *trackp);
+static int next_wr_addr_jvc(SCSI *usalp, track_t *, long *ap);
+static int write_teac_xg1(SCSI *usalp, caddr_t, long, long, int, BOOL);
+static int cdr_write_teac(SCSI *usalp, caddr_t bp, long sectaddr, long size,
int blocks, BOOL islast);
-static int open_track_jvc(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int teac_fixation(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int close_track_teac(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int teac_open_session(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int initsub_teac(SCSI *scgp, int toctype, int multi);
-static int teac_doopc(SCSI *scgp);
-static int teac_opc(SCSI *scgp, caddr_t, int cnt, int doopc);
-static int opt_power_judge(SCSI *scgp, int judge);
-static int clear_subcode(SCSI *scgp);
-static int set_limits(SCSI *scgp, long lba, long length);
-static int set_subcode(SCSI *scgp, Uchar *subcode_data, int length);
-static int read_disk_info_teac(SCSI *scgp, Uchar *data, int length,
+static int open_track_jvc(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int teac_fixation(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int close_track_teac(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int teac_open_session(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int initsub_teac(SCSI *usalp, int toctype, int multi);
+static int teac_doopc(SCSI *usalp);
+static int teac_opc(SCSI *usalp, caddr_t, int cnt, int doopc);
+static int opt_power_judge(SCSI *usalp, int judge);
+static int clear_subcode(SCSI *usalp);
+static int set_limits(SCSI *usalp, long lba, long length);
+static int set_subcode(SCSI *usalp, Uchar *subcode_data, int length);
+static int read_disk_info_teac(SCSI *usalp, Uchar *data, int length,
int type);
-static int teac_freeze(SCSI *scgp, int bp_flag);
-static int teac_wr_pma(SCSI *scgp);
-static int teac_rd_pma(SCSI *scgp);
-static int next_wr_addr_teac(SCSI *scgp, long start_lba, long last_lba);
-static int blank_jvc(SCSI *scgp, cdr_t *dp, long addr, int blanktype);
-static int buf_cap_teac(SCSI *scgp, long *sp, long *fp);
-static long read_peak_buffer_cap_teac(SCSI *scgp);
-static int buffer_inquiry_teac(SCSI *scgp, int fmt);
+static int teac_freeze(SCSI *usalp, int bp_flag);
+static int teac_wr_pma(SCSI *usalp);
+static int teac_rd_pma(SCSI *usalp);
+static int next_wr_addr_teac(SCSI *usalp, long start_lba, long last_lba);
+static int blank_jvc(SCSI *usalp, cdr_t *dp, long addr, int blanktype);
+static int buf_cap_teac(SCSI *usalp, long *sp, long *fp);
+static long read_peak_buffer_cap_teac(SCSI *usalp);
+static int buffer_inquiry_teac(SCSI *usalp, int fmt);
#ifdef XXBUFFER
-static void check_buffer_teac(SCSI *scgp);
+static void check_buffer_teac(SCSI *usalp);
#endif
#ifdef XXDEBUG
-static void xxtest_teac(SCSI *scgp);
+static void xxtest_teac(SCSI *usalp);
#endif
@@ -302,13 +302,13 @@
};
static int
-teac_init(SCSI *scgp, cdr_t *dp)
+teac_init(SCSI *usalp, cdr_t *dp)
{
- return (speed_select_teac(scgp, dp, NULL));
+ return (speed_select_teac(usalp, dp, NULL));
}
static int
-teac_getdisktype(SCSI *scgp, cdr_t *dp)
+teac_getdisktype(SCSI *usalp, cdr_t *dp)
{
dstat_t *dsp = dp->cdr_dstat;
struct scsi_mode_data md;
@@ -320,8 +320,8 @@
fillbytes((caddr_t)&md, sizeof (md), '\0');
- (void) test_unit_ready(scgp);
- if (mode_sense(scgp, (Uchar *)&md, count, page, 0) < 0) { /* Page n current */
+ (void) test_unit_ready(usalp);
+ if (mode_sense(usalp, (Uchar *)&md, count, page, 0) < 0) { /* Page n current */
return (-1);
} else {
len = ((struct scsi_mode_header *)&md)->sense_data_len + 1;
@@ -331,11 +331,11 @@
l = a_to_u_3_byte(md.blockdesc.nlblock);
dsp->ds_maxblocks = l;
- return (drive_getdisktype(scgp, dp));
+ return (drive_getdisktype(usalp, dp));
}
static int
-speed_select_teac(SCSI *scgp, cdr_t *dp, int *speedp)
+speed_select_teac(SCSI *usalp, cdr_t *dp, int *speedp)
{
struct cdd_52x_mode_data md;
int count;
@@ -355,7 +355,7 @@
md.pagex.teac_page21.p_len = 0x01;
md.pagex.teac_page21.dummy = dummy?3:0;
- status = mode_select(scgp, (Uchar *)&md, count, 0, scgp->inq->data_format >= 2);
+ status = mode_select(usalp, (Uchar *)&md, count, 0, usalp->inq->data_format >= 2);
if (status < 0)
return (status);
@@ -372,11 +372,11 @@
md.pagex.teac_page31.p_len = 0x02;
md.pagex.teac_page31.speed = speed;
- return (mode_select(scgp, (Uchar *)&md, count, 0, scgp->inq->data_format >= 2));
+ return (mode_select(usalp, (Uchar *)&md, count, 0, usalp->inq->data_format >= 2));
}
static int
-select_secsize_teac(SCSI *scgp, track_t *trackp)
+select_secsize_teac(SCSI *usalp, track_t *trackp)
{
struct scsi_mode_data md;
int count = sizeof (struct scsi_mode_header) +
@@ -386,8 +386,8 @@
fillbytes((caddr_t)&md, sizeof (md), '\0');
- (void) test_unit_ready(scgp);
- if (mode_sense(scgp, (Uchar *)&md, count, page, 0) < 0) { /* Page n current */
+ (void) test_unit_ready(usalp);
+ if (mode_sense(usalp, (Uchar *)&md, count, page, 0) < 0) { /* Page n current */
return (-1);
} else {
len = ((struct scsi_mode_header *)&md)->sense_data_len + 1;
@@ -403,18 +403,18 @@
md.blockdesc.density = 4;
i_to_3_byte(md.blockdesc.lblen, trackp->secsize);
- return (mode_select(scgp, (Uchar *)&md, count, 0, scgp->inq->data_format >= 2));
+ return (mode_select(usalp, (Uchar *)&md, count, 0, usalp->inq->data_format >= 2));
}
static int
-next_wr_addr_jvc(SCSI *scgp, track_t *trackp, long *ap)
+next_wr_addr_jvc(SCSI *usalp, track_t *trackp, long *ap)
{
if (trackp != 0 && trackp->track > 0) {
*ap = lba_addr;
} else {
long nwa;
- if (read_B0(scgp, TRUE, &nwa, NULL) < 0)
+ if (read_B0(usalp, TRUE, &nwa, NULL) < 0)
return (-1);
*ap = nwa + 150;
@@ -423,14 +423,14 @@
}
static int
-write_teac_xg1(SCSI *scgp,
+write_teac_xg1(SCSI *usalp,
caddr_t bp /* address of buffer */,
long sectaddr /* disk address (sector) to put */,
long size /* number of bytes to transfer */,
int blocks /* sector count */,
BOOL extwr /* is an extended write */)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -440,20 +440,20 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = SC_EWRITE;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdbaddr(&scmd->cdb.g1_cdb, sectaddr);
g1_cdblen(&scmd->cdb.g1_cdb, blocks);
scmd->cdb.g1_cdb.vu_97 = extwr;
- scgp->cmdname = "write_teac_g1";
+ usalp->cmdname = "write_teac_g1";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
- return (size - scg_getresid(scgp));
+ return (size - usal_getresid(usalp));
}
static int
-cdr_write_teac(SCSI *scgp,
+cdr_write_teac(SCSI *usalp,
caddr_t bp /* address of buffer */,
long sectaddr /* disk address (sector) to put */,
long size /* number of bytes to transfer */,
@@ -465,19 +465,19 @@
if (islast)
last_done = TRUE;
- ret = write_teac_xg1(scgp, bp, sectaddr, size, blocks, !islast);
+ ret = write_teac_xg1(usalp, bp, sectaddr, size, blocks, !islast);
if (ret < 0)
return (ret);
lba_addr = sectaddr + blocks;
#ifdef XXBUFFER
- check_buffer_teac(scgp);
+ check_buffer_teac(usalp);
#endif
return (ret);
}
static int
-open_track_jvc(SCSI *scgp, cdr_t *dp, track_t *trackp)
+open_track_jvc(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
int status;
long blocks;
@@ -486,11 +486,11 @@
last_done = FALSE;
- if (select_secsize_teac(scgp, trackp) < 0)
+ if (select_secsize_teac(usalp, trackp) < 0)
return (-1);
- status = clear_subcode(scgp);
-/*next_wr_addr_teac(scgp);*/
+ status = clear_subcode(usalp);
+/*next_wr_addr_teac(usalp);*/
if (status < 0)
return (status);
@@ -500,7 +500,7 @@
lba_addr, trackp->pregapsize, lba_addr + trackp->pregapsize);
}
- status = set_limits(scgp, lba_addr, trackp->pregapsize);
+ status = set_limits(usalp, lba_addr, trackp->pregapsize);
if (status < 0)
return (status);
@@ -511,9 +511,9 @@
st2mode[trackp->sectype&ST_MASK], ADR_POS, trackp->trackno, 0);
if (lverbose > 1)
- scg_prbytes("Subcode:", (Uchar *)&sc, sizeof (sc));
+ usal_prbytes("Subcode:", (Uchar *)&sc, sizeof (sc));
- status = set_subcode(scgp, (Uchar *)&sc, sizeof (sc));
+ status = set_subcode(usalp, (Uchar *)&sc, sizeof (sc));
if (status < 0)
return (status);
@@ -529,7 +529,7 @@
/*
* XXX Do we need to check isecsize too?
*/
- if (pad_track(scgp, dp, trackp,
+ if (pad_track(usalp, dp, trackp,
lba_addr, (Llong)pregapsize*trackp->secsize,
FALSE, (Llong *)0) < 0)
return (-1);
@@ -555,7 +555,7 @@
printf("set_limits(%ld, %ld)-> %ld\n",
lba_addr, blocks, lba_addr + blocks);
}
- status = set_limits(scgp, lba_addr, blocks);
+ status = set_limits(usalp, lba_addr, blocks);
if (status < 0)
return (status);
@@ -566,9 +566,9 @@
st2mode[trackp->sectype&ST_MASK], ADR_POS, trackp->trackno, 1);
if (lverbose > 1)
- scg_prbytes("Subcode:", (Uchar *)&sc, sizeof (sc));
+ usal_prbytes("Subcode:", (Uchar *)&sc, sizeof (sc));
- status = set_subcode(scgp, (Uchar *)&sc, sizeof (sc));
+ status = set_subcode(usalp, (Uchar *)&sc, sizeof (sc));
if (status < 0)
return (status);
@@ -581,7 +581,7 @@
blocks, pregapsize, blocks + pregapsize);
}
- status = set_limits(scgp, blocks, pregapsize);
+ status = set_limits(usalp, blocks, pregapsize);
if (status < 0)
return (status);
@@ -593,9 +593,9 @@
st2mode[trackp->sectype&ST_MASK], ADR_POS, trackp->trackno, 0);
if (lverbose > 1)
- scg_prbytes("Subcode:", (Uchar *)&sc, sizeof (sc));
+ usal_prbytes("Subcode:", (Uchar *)&sc, sizeof (sc));
- status = set_subcode(scgp, (Uchar *)&sc, sizeof (sc));
+ status = set_subcode(usalp, (Uchar *)&sc, sizeof (sc));
if (status < 0)
return (status);
}
@@ -605,7 +605,7 @@
static char sector[3000];
static int
-close_track_teac(SCSI *scgp, cdr_t *dp, track_t *trackp)
+close_track_teac(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
int ret = 0;
@@ -616,12 +616,12 @@
* XXX do we really need this ?
* XXX if we need this can we set blocks to 0 ?
*/
- ret = write_teac_xg1(scgp, sector, lba_addr, 2352, 1, FALSE);
+ ret = write_teac_xg1(usalp, sector, lba_addr, 2352, 1, FALSE);
lba_addr++;
}
if (!is_audio(trackp))
lba_addr += 2;
- teac_wr_pma(scgp);
+ teac_wr_pma(usalp);
return (ret);
}
@@ -691,18 +691,18 @@
};
static int
-teac_attach(SCSI *scgp, cdr_t *dp)
+teac_attach(SCSI *usalp, cdr_t *dp)
{
- scg_setnonstderrs(scgp, sd_teac50_error_str);
+ usal_setnonstderrs(usalp, sd_teac50_error_str);
#ifdef XXDEBUG
- xxtest_teac(scgp);
+ xxtest_teac(usalp);
exit(0);
#endif
return (0);
}
static int
-teac_fixation(SCSI *scgp, cdr_t *dp, track_t *trackp)
+teac_fixation(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
long lba;
int status;
@@ -716,7 +716,7 @@
* As long as we cannot read and interpret the PMA, we must
* abort here.
*/
- teac_rd_pma(scgp);
+ teac_rd_pma(usalp);
/* errmsgno(EX_BAD, "Cannot fixate zero track disk.\n");*/
errmsgno(EX_BAD, "Cannot fixate without track list (not yet implemented).\n");
return (-1);
@@ -725,7 +725,7 @@
sleep(1);
- status = clear_subcode(scgp);
+ status = clear_subcode(usalp);
sleep(1);
if (status < 0)
return (status);
@@ -799,9 +799,9 @@
status = sp - ((Uchar *)buf);
if (lverbose > 1) {
printf("Subcode len: %d\n", status);
- scg_prbytes("Subcode:", (Uchar *)buf, status);
+ usal_prbytes("Subcode:", (Uchar *)buf, status);
}
- status = set_subcode(scgp, (Uchar *)buf, status);
+ status = set_subcode(usalp, (Uchar *)buf, status);
sleep(1);
if (status < 0)
return (status);
@@ -809,13 +809,13 @@
/*
* now write the toc
*/
- status = teac_freeze(scgp, (track_base(trackp)->tracktype & TOCF_MULTI) == 0);
+ status = teac_freeze(usalp, (track_base(trackp)->tracktype & TOCF_MULTI) == 0);
return (status);
}
static int
-teac_open_session(SCSI *scgp, cdr_t *dp, track_t *trackp)
+teac_open_session(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
Uint i;
@@ -830,21 +830,21 @@
return (-1);
}
}
- return (initsub_teac(scgp, track_base(trackp)->tracktype & TOC_MASK,
+ return (initsub_teac(usalp, track_base(trackp)->tracktype & TOC_MASK,
track_base(trackp)->tracktype & TOCF_MULTI));
}
static int
-initsub_teac(SCSI *scgp, int toctype, int multi)
+initsub_teac(SCSI *usalp, int toctype, int multi)
{
int status;
- scgp->silent++;
- if (read_B0(scgp, TRUE, &lba_addr, NULL) < 0)
+ usalp->silent++;
+ if (read_B0(usalp, TRUE, &lba_addr, NULL) < 0)
lba_addr = -150;
- scgp->silent--;
+ usalp->silent--;
- status = clear_subcode(scgp);
+ status = clear_subcode(usalp);
if (status < 0)
return (status);
@@ -852,7 +852,7 @@
}
static int
-teac_doopc(SCSI *scgp)
+teac_doopc(SCSI *usalp)
{
int status;
@@ -860,7 +860,7 @@
fprintf(stdout, "Judging disk...");
flush();
}
- status = opt_power_judge(scgp, 1);
+ status = opt_power_judge(usalp, 1);
if (status < 0) {
printf("\n");
return (status);
@@ -870,30 +870,30 @@
flush();
}
- status = opt_power_judge(scgp, 0);
+ status = opt_power_judge(usalp, 0);
if (lverbose) {
fprintf(stdout, "done.\n");
}
/*
* Check for error codes 0xCD ... 0xCF
*/
- scgp->silent++;
- if (next_wr_addr_teac(scgp, -1, -1) < 0) {
- if (scgp->verbose == 0 && scg_sense_key(scgp) != SC_ILLEGAL_REQUEST)
- scg_printerr(scgp);
+ usalp->silent++;
+ if (next_wr_addr_teac(usalp, -1, -1) < 0) {
+ if (usalp->verbose == 0 && usal_sense_key(usalp) != SC_ILLEGAL_REQUEST)
+ usal_printerr(usalp);
}
- scgp->silent--;
+ usalp->silent--;
return (status);
}
static int
-teac_opc(SCSI *scgp, caddr_t bp, int cnt, int doopc)
+teac_opc(SCSI *usalp, caddr_t bp, int cnt, int doopc)
{
int status;
int count = 0;
do {
- status = teac_doopc(scgp);
+ status = teac_doopc(usalp);
} while (++count <= 1 && status < 0);
return (status);
@@ -918,9 +918,9 @@
* Optimum power calibration for Teac Drives.
*/
static int
-opt_power_judge(SCSI *scgp, int judge)
+opt_power_judge(SCSI *usalp, int judge)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)0;
@@ -931,21 +931,21 @@
scmd->timeout = 60;
scmd->cdb.g5_cdb.cmd = SC_OPC_EXECUTE;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g5_cdb.reladr = judge; /* Judge the Disc */
- scgp->cmdname = "opt_power_judge";
+ usalp->cmdname = "opt_power_judge";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
/*
* Clear subcodes for Teac Drives.
*/
static int
-clear_subcode(SCSI *scgp)
+clear_subcode(SCSI *usalp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)0;
@@ -955,21 +955,21 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = SC_CLEAR_SUBCODE;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g5_cdb.addr[3] = 0x80;
- scgp->cmdname = "clear subcode";
+ usalp->cmdname = "clear subcode";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
/*
* Set limits for command linking for Teac Drives.
*/
static int
-set_limits(SCSI *scgp, long lba, long length)
+set_limits(SCSI *usalp, long lba, long length)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)0;
@@ -979,22 +979,22 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = SC_SET_LIMITS;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
i_to_4_byte(&scmd->cdb.g5_cdb.addr[0], lba);
i_to_4_byte(&scmd->cdb.g5_cdb.count[0], length);
- scgp->cmdname = "set limits";
+ usalp->cmdname = "set limits";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
/*
* Set subcode for Teac Drives.
*/
static int
-set_subcode(SCSI *scgp, Uchar *subcode_data, int length)
+set_subcode(SCSI *usalp, Uchar *subcode_data, int length)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)subcode_data;
@@ -1004,18 +1004,18 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = SC_SET_SUBCODE;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdblen(&scmd->cdb.g1_cdb, length);
- scgp->cmdname = "set subcode";
+ usalp->cmdname = "set subcode";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
static int
-read_disk_info_teac(SCSI *scgp, Uchar *data, int length, int type)
+read_disk_info_teac(SCSI *usalp, Uchar *data, int length, int type)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)data;
@@ -1025,23 +1025,23 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = SC_READ_DISK_INFO;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.reladr = type & 1;
scmd->cdb.g1_cdb.res = (type & 2) >> 1;
- scgp->cmdname = "read disk info teac";
+ usalp->cmdname = "read disk info teac";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
/*
* Perform the freeze command for Teac Drives.
*/
static int
-teac_freeze(SCSI *scgp, int bp_flag)
+teac_freeze(SCSI *usalp, int bp_flag)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)0;
@@ -1052,18 +1052,18 @@
scmd->timeout = 8 * 60; /* Needs up to 4 minutes */
scmd->cdb.g5_cdb.cmd = SC_FREEZE;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g5_cdb.addr[3] = bp_flag ? 0x80 : 0;
- scgp->cmdname = "teac_freeze";
+ usalp->cmdname = "teac_freeze";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
static int
-teac_wr_pma(SCSI *scgp)
+teac_wr_pma(SCSI *usalp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)0;
@@ -1073,21 +1073,21 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = SC_WRITE_PMA;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
- scgp->cmdname = "teac_write_pma";
+ usalp->cmdname = "teac_write_pma";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
/*
* Read PMA for Teac Drives.
*/
static int
-teac_rd_pma(SCSI *scgp)
+teac_rd_pma(SCSI *usalp)
{
unsigned char xx[256];
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)xx, sizeof (xx), '\0');
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
@@ -1098,28 +1098,28 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = SC_READ_PMA;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdblen(&scmd->cdb.g1_cdb, sizeof (xx));
- scgp->cmdname = "teac_read_pma";
+ usalp->cmdname = "teac_read_pma";
-/* return (scg_cmd(scgp));*/
- if (scg_cmd(scgp) < 0)
+/* return (usal_cmd(usalp));*/
+ if (usal_cmd(usalp) < 0)
return (-1);
- if (scgp->verbose) {
- scg_prbytes("PMA Data", xx, sizeof (xx) - scg_getresid(scgp));
+ if (usalp->verbose) {
+ usal_prbytes("PMA Data", xx, sizeof (xx) - usal_getresid(usalp));
}
if (lverbose) {
unsigned i;
Uchar *p;
- scg_prbytes("PMA Header: ", xx, 4);
+ usal_prbytes("PMA Header: ", xx, 4);
i = xx[2];
p = &xx[4];
for (; i <= xx[3]; i++) {
- scg_prbytes("PMA: ", p, 10);
+ usal_prbytes("PMA: ", p, 10);
p += 10;
}
}
@@ -1130,10 +1130,10 @@
* Next writable address for Teac Drives.
*/
static int
-next_wr_addr_teac(SCSI *scgp, long start_lba, long last_lba)
+next_wr_addr_teac(SCSI *usalp, long start_lba, long last_lba)
{
unsigned char xx[256];
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)xx, sizeof (xx), '\0');
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
@@ -1144,30 +1144,30 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = SC_NEXT_WR_ADDRESS;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
i_to_4_byte(&scmd->cdb.g5_cdb.addr[0], start_lba);
i_to_4_byte(&scmd->cdb.g5_cdb.count[0], last_lba);
- if (scgp->verbose)
+ if (usalp->verbose)
printf("start lba: %ld last lba: %ld\n",
start_lba, last_lba);
- scgp->cmdname = "next writable address";
+ usalp->cmdname = "next writable address";
-/* return (scg_cmd(scgp));*/
- if (scg_cmd(scgp) < 0)
+/* return (usal_cmd(usalp));*/
+ if (usal_cmd(usalp) < 0)
return (-1);
- if (scgp->verbose) {
- scg_prbytes("WRa Data", xx, sizeof (xx) - scg_getresid(scgp));
+ if (usalp->verbose) {
+ usal_prbytes("WRa Data", xx, sizeof (xx) - usal_getresid(usalp));
printf("NWA: %ld\n", a_to_4_byte(xx));
}
return (0);
}
static int
-blank_jvc(SCSI *scgp, cdr_t *dp, long addr, int blanktype)
+blank_jvc(SCSI *usalp, cdr_t *dp, long addr, int blanktype)
{
extern char *blank_types[];
@@ -1176,18 +1176,18 @@
flush();
}
- return (scsi_blank(scgp, addr, blanktype, FALSE));
+ return (scsi_blank(usalp, addr, blanktype, FALSE));
}
static int
-buf_cap_teac(SCSI *scgp, long *sp, long *fp)
+buf_cap_teac(SCSI *usalp, long *sp, long *fp)
{
Ulong freespace;
Ulong bufsize;
long ret;
int per;
- ret = read_peak_buffer_cap_teac(scgp);
+ ret = read_peak_buffer_cap_teac(usalp);
if (ret < 0)
return (-1);
bufsize = ret;
@@ -1197,7 +1197,7 @@
if (fp)
*fp = freespace;
- if (scgp->verbose || (sp == 0 && fp == 0))
+ if (usalp->verbose || (sp == 0 && fp == 0))
printf("BFree: %ld K BSize: %ld K\n", freespace >> 10, bufsize >> 10);
if (bufsize == 0)
@@ -1211,10 +1211,10 @@
}
static long
-read_peak_buffer_cap_teac(SCSI *scgp)
+read_peak_buffer_cap_teac(SCSI *usalp)
{
Uchar xx[4];
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)xx, sizeof (xx), '\0');
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
@@ -1225,19 +1225,19 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = SC_READ_PEAK_BUF_CAP;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
- scgp->cmdname = "read peak buffer capacity";
+ usalp->cmdname = "read peak buffer capacity";
#define BDEBUG
#ifndef BDEBUG
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
#else
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
- if (scgp->verbose) {
- scg_prbytes("WRa Data", xx, sizeof (xx) - scg_getresid(scgp));
+ if (usalp->verbose) {
+ usal_prbytes("WRa Data", xx, sizeof (xx) - usal_getresid(usalp));
printf("Buffer cap: %ld\n", a_to_u_3_byte(&xx[1]));
}
return (a_to_u_3_byte(&xx[1]));
@@ -1250,10 +1250,10 @@
#define BI_APP_CODE 0x10
static int
-buffer_inquiry_teac(SCSI *scgp, int fmt)
+buffer_inquiry_teac(SCSI *usalp, int fmt)
{
Uchar xx[448];
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)xx, sizeof (xx), '\0');
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
@@ -1265,7 +1265,7 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = SC_BUFFER_INQUIRY;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
if (fmt > 0) {
scmd->cdb.g5_cdb.addr[3] = fmt;
@@ -1276,21 +1276,21 @@
/* scmd->cdb.g5_cdb.addr[3] = BI_APP_CODE;*/
}
- scgp->cmdname = "buffer inquiry";
+ usalp->cmdname = "buffer inquiry";
#define BDEBUG
#ifndef BDEBUG
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
#else
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
- if (scgp->verbose) {
-/* scg_prbytes("WRa Data", xx, sizeof (xx) - scg_getresid(scgp));*/
-/* scg_prbytes("WRa Data", xx, 1);*/
+ if (usalp->verbose) {
+/* usal_prbytes("WRa Data", xx, sizeof (xx) - usal_getresid(usalp));*/
+/* usal_prbytes("WRa Data", xx, 1);*/
if (fmt > 0) printf("fmt: %X ", fmt);
- scg_prbytes("WRa Data", xx, 9);
+ usal_prbytes("WRa Data", xx, 9);
printf("%d\n", xx[8] - xx[1]);
/* printf("Buffer cap: %ld\n", a_to_u_3_byte(&xx[1]));*/
}
@@ -1300,29 +1300,29 @@
#ifdef XXBUFFER
static void
-check_buffer_teac(SCSI *scgp)
+check_buffer_teac(SCSI *usalp)
{
printf("-------\n");
- buffer_inquiry_teac(scgp, 0);
+ buffer_inquiry_teac(usalp, 0);
#ifdef SL
usleep(40000);
- buffer_inquiry_teac(scgp, 0);
+ buffer_inquiry_teac(usalp, 0);
#endif
- read_peak_buffer_cap_teac(scgp);
+ read_peak_buffer_cap_teac(usalp);
}
#endif
/*--------------------------------------------------------------------------*/
#ifdef XXDEBUG
#include "scsimmc.h"
-static int g7_teac(SCSI *scgp);
-static int g6_teac(SCSI *scgp);
+static int g7_teac(SCSI *usalp);
+static int g6_teac(SCSI *usalp);
static int
-g7_teac(SCSI *scgp)
+g7_teac(SCSI *usalp)
{
Uchar xx[2048];
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)xx, sizeof (xx), '\0');
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
@@ -1334,7 +1334,7 @@
scmd->cdb.g5_cdb.cmd = 0xDf;
/* scmd->cdb.g5_cdb.cmd = 0xE5;*/
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
/* scmd->cdb.g5_cdb.addr[3] = BI_ONE_BYTE;*/
/* scmd->size = 1;*/
@@ -1342,16 +1342,16 @@
/* scmd->cdb.g5_cdb.addr[3] = BI_448_BYTE;*/
/* scmd->cdb.g5_cdb.addr[3] = BI_APP_CODE;*/
- scgp->cmdname = "g7 teac";
+ usalp->cmdname = "g7 teac";
-/* return (scg_cmd(scgp));*/
- if (scg_cmd(scgp) < 0)
+/* return (usal_cmd(usalp));*/
+ if (usal_cmd(usalp) < 0)
return (-1);
-/* if (scgp->verbose) {*/
- scg_prbytes("WRa Data", xx, sizeof (xx) - scg_getresid(scgp));
-/* scg_prbytes("WRa Data", xx, 1);*/
-/* scg_prbytes("WRa Data", xx, 9);*/
+/* if (usalp->verbose) {*/
+ usal_prbytes("WRa Data", xx, sizeof (xx) - usal_getresid(usalp));
+/* usal_prbytes("WRa Data", xx, 1);*/
+/* usal_prbytes("WRa Data", xx, 9);*/
/*printf("%d\n", xx[8] - xx[1]);*/
/* printf("Buffer cap: %ld\n", a_to_u_3_byte(&xx[1]));*/
/* }*/
@@ -1359,10 +1359,10 @@
}
static int
-g6_teac(SCSI *scgp)
+g6_teac(SCSI *usalp)
{
Uchar xx[2048];
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)xx, sizeof (xx), '\0');
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
@@ -1379,18 +1379,18 @@
scmd->cdb.g1_cdb.cmd = 0xCe;
scmd->cdb.g1_cdb.cmd = 0xCF;
scmd->cdb.g1_cdb.cmd = 0xC7; /* Read TOC */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
- scgp->cmdname = "g6 teac";
+ usalp->cmdname = "g6 teac";
-/* return (scg_cmd(scgp));*/
- if (scg_cmd(scgp) < 0)
+/* return (usal_cmd(usalp));*/
+ if (usal_cmd(usalp) < 0)
return (-1);
-/* if (scgp->verbose) {*/
- scg_prbytes("WRa Data", xx, sizeof (xx) - scg_getresid(scgp));
-/* scg_prbytes("WRa Data", xx, 1);*/
-/* scg_prbytes("WRa Data", xx, 9);*/
+/* if (usalp->verbose) {*/
+ usal_prbytes("WRa Data", xx, sizeof (xx) - usal_getresid(usalp));
+/* usal_prbytes("WRa Data", xx, 1);*/
+/* usal_prbytes("WRa Data", xx, 9);*/
/*printf("%d\n", xx[8] - xx[1]);*/
/* printf("Buffer cap: %ld\n", a_to_u_3_byte(&xx[1]));*/
/* }*/
@@ -1398,24 +1398,24 @@
}
static void
-xxtest_teac(SCSI *scgp)
+xxtest_teac(SCSI *usalp)
{
- read_peak_buffer_cap_teac(scgp);
+ read_peak_buffer_cap_teac(usalp);
/*#define XDI*/
#ifdef XDI
{
Uchar cbuf[512];
-/* read_disk_info_teac(scgp, data, length, type)*/
-/* read_disk_info_teac(scgp, cbuf, 512, 2);*/
-/* read_disk_info_teac(scgp, cbuf, 512, 2);*/
- read_disk_info_teac(scgp, cbuf, 512, 3);
- scg_prbytes("DI Data", cbuf, sizeof (cbuf) - scg_getresid(scgp));
+/* read_disk_info_teac(usalp, data, length, type)*/
+/* read_disk_info_teac(usalp, cbuf, 512, 2);*/
+/* read_disk_info_teac(usalp, cbuf, 512, 2);*/
+ read_disk_info_teac(usalp, cbuf, 512, 3);
+ usal_prbytes("DI Data", cbuf, sizeof (cbuf) - usal_getresid(usalp));
}
#endif /* XDI */
- buffer_inquiry_teac(scgp, -1);
+ buffer_inquiry_teac(usalp, -1);
/*#define XBU*/
#ifdef XBU
@@ -1423,15 +1423,15 @@
int i;
for (i = 0; i < 63; i++) {
- scgp->silent++;
- buffer_inquiry_teac(scgp, i<<2);
- scgp->silent--;
+ usalp->silent++;
+ buffer_inquiry_teac(usalp, i<<2);
+ usalp->silent--;
}
}
#endif /* XBU */
/* printf("LLLL\n");*/
-/* g7_teac(scgp);*/
-/* g6_teac(scgp);*/
+/* g7_teac(usalp);*/
+/* g6_teac(usalp);*/
}
#endif /* XXDEBUG */
Modified: cdrkit/trunk/wodim/drv_mmc.c
===================================================================
--- cdrkit/trunk/wodim/drv_mmc.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/drv_mmc.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -55,10 +55,10 @@
#include <intcvt.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsidefs.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsidefs.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include "scsimmc.h"
#include "mmcvendor.h"
@@ -88,99 +88,99 @@
};
#ifdef __needed__
-static int mmc_load(SCSI *scgp, cdr_t *dp);
-static int mmc_unload(SCSI *scgp, cdr_t *dp);
+static int mmc_load(SCSI *usalp, cdr_t *dp);
+static int mmc_unload(SCSI *usalp, cdr_t *dp);
#endif
void mmc_opthelp(cdr_t *dp, int excode);
char *hasdrvopt(char *optstr, char *optname);
-static cdr_t *identify_mmc(SCSI *scgp, cdr_t *, struct scsi_inquiry *);
-static int attach_mmc(SCSI *scgp, cdr_t *);
-static int attach_mdvd(SCSI *scgp, cdr_t *);
-int check_writemodes_mmc(SCSI *scgp, cdr_t *dp);
-int check_writemodes_mdvd(SCSI *scgp, cdr_t *dp);
-static int deflt_writemodes_mmc(SCSI *scgp, BOOL reset_dummy);
-static int deflt_writemodes_mdvd(SCSI *scgp, BOOL reset_dummy);
-static int get_diskinfo(SCSI *scgp, struct disk_info *dip);
+static cdr_t *identify_mmc(SCSI *usalp, cdr_t *, struct scsi_inquiry *);
+static int attach_mmc(SCSI *usalp, cdr_t *);
+static int attach_mdvd(SCSI *usalp, cdr_t *);
+int check_writemodes_mmc(SCSI *usalp, cdr_t *dp);
+int check_writemodes_mdvd(SCSI *usalp, cdr_t *dp);
+static int deflt_writemodes_mmc(SCSI *usalp, BOOL reset_dummy);
+static int deflt_writemodes_mdvd(SCSI *usalp, BOOL reset_dummy);
+static int get_diskinfo(SCSI *usalp, struct disk_info *dip);
static void di_to_dstat(struct disk_info *dip, dstat_t *dsp);
-static int get_atip(SCSI *scgp, struct atipinfo *atp);
+static int get_atip(SCSI *usalp, struct atipinfo *atp);
#ifdef PRINT_ATIP
-static int get_pma(SCSI *scgp);
+static int get_pma(SCSI *usalp);
#endif
-static int init_mmc(SCSI *scgp, cdr_t *dp);
-static int getdisktype_mmc(SCSI *scgp, cdr_t *dp);
-static int getdisktype_mdvd(SCSI *scgp, cdr_t *dp);
-static int speed_select_mmc(SCSI *scgp, cdr_t *dp, int *speedp);
-static int speed_select_mdvd(SCSI *scgp, cdr_t *dp, int *speedp);
-static int mmc_set_speed(SCSI *scgp, int readspeed, int writespeed,
+static int init_mmc(SCSI *usalp, cdr_t *dp);
+static int getdisktype_mmc(SCSI *usalp, cdr_t *dp);
+static int getdisktype_mdvd(SCSI *usalp, cdr_t *dp);
+static int speed_select_mmc(SCSI *usalp, cdr_t *dp, int *speedp);
+static int speed_select_mdvd(SCSI *usalp, cdr_t *dp, int *speedp);
+static int mmc_set_speed(SCSI *usalp, int readspeed, int writespeed,
int rotctl);
-static int next_wr_addr_mmc(SCSI *scgp, track_t *trackp, long *ap);
-static int next_wr_addr_mdvd(SCSI *scgp, track_t *trackp, long *ap);
-static int write_leadin_mmc(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int open_track_mmc(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int open_track_mdvd(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int close_track_mmc(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int close_track_mdvd(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int open_session_mmc(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int open_session_mdvd(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int waitfix_mmc(SCSI *scgp, int secs);
-static int fixate_mmc(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int fixate_mdvd(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int blank_mmc(SCSI *scgp, cdr_t *dp, long addr, int blanktype);
-static int format_mdvd(SCSI *scgp, cdr_t *dp, int formattype);
-static int send_opc_mmc(SCSI *scgp, caddr_t, int cnt, int doopc);
-static int opt1_mmc(SCSI *scgp, cdr_t *dp);
-static int opt1_mdvd(SCSI *scgp, cdr_t *dp);
-static int opt2_mmc(SCSI *scgp, cdr_t *dp);
-static int scsi_sony_write(SCSI *scgp, caddr_t bp, long sectaddr, long size,
+static int next_wr_addr_mmc(SCSI *usalp, track_t *trackp, long *ap);
+static int next_wr_addr_mdvd(SCSI *usalp, track_t *trackp, long *ap);
+static int write_leadin_mmc(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int open_track_mmc(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int open_track_mdvd(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int close_track_mmc(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int close_track_mdvd(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int open_session_mmc(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int open_session_mdvd(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int waitfix_mmc(SCSI *usalp, int secs);
+static int fixate_mmc(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int fixate_mdvd(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int blank_mmc(SCSI *usalp, cdr_t *dp, long addr, int blanktype);
+static int format_mdvd(SCSI *usalp, cdr_t *dp, int formattype);
+static int send_opc_mmc(SCSI *usalp, caddr_t, int cnt, int doopc);
+static int opt1_mmc(SCSI *usalp, cdr_t *dp);
+static int opt1_mdvd(SCSI *usalp, cdr_t *dp);
+static int opt2_mmc(SCSI *usalp, cdr_t *dp);
+static int scsi_sony_write(SCSI *usalp, caddr_t bp, long sectaddr, long size,
int blocks, BOOL islast);
static int gen_cue_mmc(track_t *trackp, void *vcuep, BOOL needgap);
static void fillcue(struct mmc_cue *cp, int ca, int tno, int idx, int dataform,
int scms, msf_t *mp);
-static int send_cue_mmc(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int stats_mmc(SCSI *scgp, cdr_t *dp);
-static BOOL mmc_isplextor(SCSI *scgp);
-static BOOL mmc_isyamaha(SCSI *scgp);
-static void do_varirec_plextor(SCSI *scgp);
-static int do_gigarec_plextor(SCSI *scgp);
-static int drivemode_plextor(SCSI *scgp, caddr_t bp, int cnt, int modecode,
+static int send_cue_mmc(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int stats_mmc(SCSI *usalp, cdr_t *dp);
+static BOOL mmc_isplextor(SCSI *usalp);
+static BOOL mmc_isyamaha(SCSI *usalp);
+static void do_varirec_plextor(SCSI *usalp);
+static int do_gigarec_plextor(SCSI *usalp);
+static int drivemode_plextor(SCSI *usalp, caddr_t bp, int cnt, int modecode,
void *modeval);
-static int drivemode2_plextor(SCSI *scgp, caddr_t bp, int cnt, int modecode,
+static int drivemode2_plextor(SCSI *usalp, caddr_t bp, int cnt, int modecode,
void *modeval);
-static int check_varirec_plextor(SCSI *scgp);
-static int check_gigarec_plextor(SCSI *scgp);
-static int varirec_plextor(SCSI *scgp, BOOL on, int val);
-static int gigarec_plextor(SCSI *scgp, int val);
+static int check_varirec_plextor(SCSI *usalp);
+static int check_gigarec_plextor(SCSI *usalp);
+static int varirec_plextor(SCSI *usalp, BOOL on, int val);
+static int gigarec_plextor(SCSI *usalp, int val);
static Int32_t gigarec_mult(int code, Int32_t val);
-static int check_ss_hide_plextor(SCSI *scgp);
-static int check_speed_rd_plextor(SCSI *scgp);
-static int check_powerrec_plextor(SCSI *scgp);
-static int ss_hide_plextor(SCSI *scgp, BOOL do_ss, BOOL do_hide);
-static int speed_rd_plextor(SCSI *scgp, BOOL do_speedrd);
-static int powerrec_plextor(SCSI *scgp, BOOL do_powerrec);
-static int get_speeds_plextor(SCSI *scgp, int *selp, int *maxp, int *lastp);
-static int bpc_plextor(SCSI *scgp, int mode, int *bpp);
-static int set_audiomaster_yamaha(SCSI *scgp, cdr_t *dp, BOOL keep_mode);
+static int check_ss_hide_plextor(SCSI *usalp);
+static int check_speed_rd_plextor(SCSI *usalp);
+static int check_powerrec_plextor(SCSI *usalp);
+static int ss_hide_plextor(SCSI *usalp, BOOL do_ss, BOOL do_hide);
+static int speed_rd_plextor(SCSI *usalp, BOOL do_speedrd);
+static int powerrec_plextor(SCSI *usalp, BOOL do_powerrec);
+static int get_speeds_plextor(SCSI *usalp, int *selp, int *maxp, int *lastp);
+static int bpc_plextor(SCSI *usalp, int mode, int *bpp);
+static int set_audiomaster_yamaha(SCSI *usalp, cdr_t *dp, BOOL keep_mode);
-struct ricoh_mode_page_30 * get_justlink_ricoh(SCSI *scgp, Uchar *mode);
-static int force_speed_yamaha(SCSI *scgp, int readspeed, int writespeed);
-static BOOL get_tattoo_yamaha(SCSI *scgp, BOOL print, Int32_t *irp,
+struct ricoh_mode_page_30 * get_justlink_ricoh(SCSI *usalp, Uchar *mode);
+static int force_speed_yamaha(SCSI *usalp, int readspeed, int writespeed);
+static BOOL get_tattoo_yamaha(SCSI *usalp, BOOL print, Int32_t *irp,
Int32_t *orp);
-static int do_tattoo_yamaha(SCSI *scgp, FILE *f);
-static int yamaha_write_buffer(SCSI *scgp, int mode, int bufferid, long offset,
+static int do_tattoo_yamaha(SCSI *usalp, FILE *f);
+static int yamaha_write_buffer(SCSI *usalp, int mode, int bufferid, long offset,
long parlen, void *buffer, long buflen);
-static int dvd_dual_layer_split(SCSI *scgp, cdr_t *dp, long tsize);
+static int dvd_dual_layer_split(SCSI *usalp, cdr_t *dp, long tsize);
#ifdef __needed__
static int
-mmc_load(SCSI *scgp, cdr_t *dp)
+mmc_load(SCSI *usalp, cdr_t *dp)
{
- return (scsi_load_unload(scgp, 1));
+ return (scsi_load_unload(usalp, 1));
}
static int
-mmc_unload(SCSI *scgp, cdr_t *dp)
+mmc_unload(SCSI *usalp, cdr_t *dp)
{
- return (scsi_load_unload(scgp, 0));
+ return (scsi_load_unload(usalp, 0));
}
#endif
@@ -252,7 +252,7 @@
(int(*)(SCSI *, Ulong))cmd_ill, /* reserve_track */
scsi_cdr_write,
(int(*)__PR((track_t *, void *, BOOL)))cmd_dummy, /* gen_cue */
- (int(*)__PR((SCSI *scgp, cdr_t *, track_t *)))cmd_dummy, /* send_cue */
+ (int(*)__PR((SCSI *usalp, cdr_t *, track_t *)))cmd_dummy, /* send_cue */
write_leadin_mmc,
open_track_mdvd,
close_track_mdvd,
@@ -337,7 +337,7 @@
(int(*)(SCSI *, cdr_t *, int))cmd_dummy, /* recover */
speed_select_mmc,
select_secsize,
- (int(*)(SCSI *scgp, track_t *, long *))cmd_ill, /* next_wr_addr */
+ (int(*)(SCSI *usalp, track_t *, long *))cmd_ill, /* next_wr_addr */
(int(*)(SCSI *, Ulong))cmd_ill, /* reserve_track */
scsi_cdr_write,
(int(*)(track_t *, void *, BOOL))cmd_dummy, /* gen_cue */
@@ -345,11 +345,11 @@
(int(*)(SCSI *, cdr_t *, track_t *))cmd_dummy, /* leadin */
open_track_mmc,
close_track_mmc,
- (int(*)(SCSI *scgp, cdr_t *, track_t *))cmd_dummy,
+ (int(*)(SCSI *usalp, cdr_t *, track_t *))cmd_dummy,
cmd_dummy,
cmd_dummy, /* abort */
read_session_offset,
- (int(*)(SCSI *scgp, cdr_t *, track_t *))cmd_dummy, /* fixation */
+ (int(*)(SCSI *usalp, cdr_t *, track_t *))cmd_dummy, /* fixation */
cmd_dummy, /* stats */
blank_dummy,
format_dummy,
@@ -381,7 +381,7 @@
(int(*)(SCSI *, cdr_t *, int))cmd_dummy, /* recover */
speed_select_mmc,
select_secsize,
- (int(*)(SCSI *scg, track_t *, long *))cmd_ill, /* next_wr_addr */
+ (int(*)(SCSI *usal, track_t *, long *))cmd_ill, /* next_wr_addr */
(int(*)(SCSI *, Ulong))cmd_ill, /* reserve_track */
scsi_cdr_write,
(int(*)(track_t *, void *, BOOL))cmd_dummy, /* gen_cue */
@@ -389,11 +389,11 @@
(int(*)(SCSI *, cdr_t *, track_t *))cmd_dummy, /* leadin */
open_track_mmc,
close_track_mmc,
- (int(*)(SCSI *scgp, cdr_t *, track_t *))cmd_dummy,
+ (int(*)(SCSI *usalp, cdr_t *, track_t *))cmd_dummy,
cmd_dummy,
cmd_dummy, /* abort */
read_session_offset_philips,
- (int(*)(SCSI *scgp, cdr_t *, track_t *))cmd_dummy, /* fixation */
+ (int(*)(SCSI *usalp, cdr_t *, track_t *))cmd_dummy, /* fixation */
cmd_dummy, /* stats */
blank_dummy,
format_dummy,
@@ -426,7 +426,7 @@
(int(*)(SCSI *, cdr_t *, int))cmd_dummy, /* recover */
speed_select_mmc,
select_secsize,
- (int(*)(SCSI *scgp, track_t *, long *))cmd_ill, /* next_wr_addr */
+ (int(*)(SCSI *usalp, track_t *, long *))cmd_ill, /* next_wr_addr */
(int(*)(SCSI *, Ulong))cmd_ill, /* reserve_track */
scsi_cdr_write,
(int(*)(track_t *, void *, BOOL))cmd_dummy, /* gen_cue */
@@ -434,11 +434,11 @@
(int(*)(SCSI *, cdr_t *, track_t *))cmd_dummy, /* leadin */
open_track_mmc,
close_track_mmc,
- (int(*)(SCSI *scgp, cdr_t *, track_t *))cmd_dummy,
+ (int(*)(SCSI *usalp, cdr_t *, track_t *))cmd_dummy,
cmd_dummy,
cmd_dummy, /* abort */
read_session_offset,
- (int(*)(SCSI *scgp, cdr_t *, track_t *))cmd_dummy, /* fixation */
+ (int(*)(SCSI *usalp, cdr_t *, track_t *))cmd_dummy, /* fixation */
cmd_dummy, /* stats */
blank_dummy,
format_dummy,
@@ -561,7 +561,7 @@
}
static cdr_t *
-identify_mmc(SCSI *scgp, cdr_t *dp, struct scsi_inquiry *ip)
+identify_mmc(SCSI *usalp, cdr_t *dp, struct scsi_inquiry *ip)
{
BOOL cdrr = FALSE; /* Read CD-R */
BOOL cdwr = FALSE; /* Write CD-R */
@@ -576,11 +576,11 @@
if (ip->type != INQ_WORM && ip->type != INQ_ROMD)
return ((cdr_t *)0);
- allow_atapi(scgp, TRUE); /* Try to switch to 10 byte mode cmds */
+ allow_atapi(usalp, TRUE); /* Try to switch to 10 byte mode cmds */
- scgp->silent++;
- mp = mmc_cap(scgp, mode); /* Get MMC capabilities */
- scgp->silent--;
+ usalp->silent++;
+ mp = mmc_cap(usalp, mode); /* Get MMC capabilities */
+ usalp->silent--;
if (mp == NULL)
return (&cdr_oldcd); /* Pre SCSI-3/mmc drive */
@@ -607,29 +607,29 @@
/*
* Now try to do it the MMC-3 way....
*/
- profile = get_curprofile(scgp);
+ profile = get_curprofile(usalp);
if (xdebug)
printf("Current profile: 0x%04X\n", profile);
if (profile == 0) {
if (xdebug)
- print_profiles(scgp);
+ print_profiles(usalp);
/*
* If the current profile is 0x0000, then the
* drive does not know about the media. First
* close the tray and then try to issue the
* get_curprofile() command again.
*/
- scgp->silent++;
- load_media(scgp, dp, FALSE);
- scgp->silent--;
- profile = get_curprofile(scgp);
- scsi_prevent_removal(scgp, 0);
+ usalp->silent++;
+ load_media(usalp, dp, FALSE);
+ usalp->silent--;
+ profile = get_curprofile(usalp);
+ scsi_prevent_removal(usalp, 0);
if (xdebug)
printf("Current profile: 0x%04X\n", profile);
}
if (profile >= 0) {
if (lverbose)
- print_profiles(scgp);
+ print_profiles(usalp);
if (profile == 0 || (profile >= 0x10 && profile <= 0x15) || profile > 0x19) {
/*
* 10h DVD-ROM
@@ -655,7 +655,7 @@
/*
* Check for CD-writer
*/
- get_wproflist(scgp, &is_cdr, NULL,
+ get_wproflist(usalp, &is_cdr, NULL,
NULL, NULL);
if (is_cdr)
return (&cdr_mmc);
@@ -702,11 +702,11 @@
char xb[32];
#ifndef DVD_DEBUG
- scgp->silent++;
+ usalp->silent++;
#else
fprintf(stderr, "identify_dvd: checking for DVD media\n");
#endif
- if (read_dvd_structure(scgp, (caddr_t)xb, 32, 0, 0, 0) >= 0) {
+ if (read_dvd_structure(usalp, (caddr_t)xb, 32, 0, 0, 0) >= 0) {
/*
* If read DVD structure is supported and works, then
* we must have a DVD media in the drive. Signal to
@@ -714,22 +714,22 @@
*/
is_dvd = TRUE;
} else {
- if (scg_sense_key(scgp) == SC_NOT_READY) {
+ if (usal_sense_key(usalp) == SC_NOT_READY) {
/*
* If the SCSI sense key is NOT READY, then the
* drive does not know about the media. First
* close the tray and then try to issue the
* read_dvd_structure() command again.
*/
- load_media(scgp, dp, FALSE);
- if (read_dvd_structure(scgp, (caddr_t)xb, 32, 0, 0, 0) >= 0) {
+ load_media(usalp, dp, FALSE);
+ if (read_dvd_structure(usalp, (caddr_t)xb, 32, 0, 0, 0) >= 0) {
is_dvd = TRUE;
}
- scsi_prevent_removal(scgp, 0);
+ scsi_prevent_removal(usalp, 0);
}
}
#ifndef DVD_DEBUG
- scgp->silent--;
+ usalp->silent--;
#else
fprintf(stderr, "identify_dvd: is_dvd: %d\n", is_dvd);
#endif
@@ -745,18 +745,18 @@
}
static int
-attach_mmc(SCSI *scgp, cdr_t *dp)
+attach_mmc(SCSI *usalp, cdr_t *dp)
{
int ret;
Uchar mode[0x100];
struct cd_mode_page_2A *mp;
struct ricoh_mode_page_30 *rp = NULL;
- allow_atapi(scgp, TRUE); /* Try to switch to 10 byte mode cmds */
+ allow_atapi(usalp, TRUE); /* Try to switch to 10 byte mode cmds */
- scgp->silent++;
- mp = mmc_cap(scgp, NULL); /* Get MMC capabilities in allocated mp */
- scgp->silent--;
+ usalp->silent++;
+ mp = mmc_cap(usalp, NULL); /* Get MMC capabilities in allocated mp */
+ usalp->silent--;
if (mp == NULL)
return (-1); /* Pre SCSI-3/mmc drive */
@@ -781,7 +781,7 @@
if (dp->cdr_speeddef > dp->cdr_speedmax)
dp->cdr_speeddef = dp->cdr_speedmax;
- rp = get_justlink_ricoh(scgp, mode);
+ rp = get_justlink_ricoh(usalp, mode);
if (mp->p_len >= 28)
dp->cdr_flags |= CDR_MMC3;
@@ -804,24 +804,24 @@
dp->cdr_flags |= CDR_BURNFREE;
}
- if (mmc_isplextor(scgp)) {
- if (check_varirec_plextor(scgp) >= 0)
+ if (mmc_isplextor(usalp)) {
+ if (check_varirec_plextor(usalp) >= 0)
dp->cdr_flags |= CDR_VARIREC;
- if (check_gigarec_plextor(scgp) >= 0)
+ if (check_gigarec_plextor(usalp) >= 0)
dp->cdr_flags |= CDR_GIGAREC;
- if (check_ss_hide_plextor(scgp) >= 0)
+ if (check_ss_hide_plextor(usalp) >= 0)
dp->cdr_flags |= CDR_SINGLESESS|CDR_HIDE_CDR;
- if (check_powerrec_plextor(scgp) >= 0)
+ if (check_powerrec_plextor(usalp) >= 0)
dp->cdr_flags |= CDR_FORCESPEED;
- if (check_speed_rd_plextor(scgp) >= 0)
+ if (check_speed_rd_plextor(usalp) >= 0)
dp->cdr_flags |= CDR_SPEEDREAD;
}
- if (mmc_isyamaha(scgp)) {
- if (set_audiomaster_yamaha(scgp, dp, FALSE) >= 0)
+ if (mmc_isyamaha(usalp)) {
+ if (set_audiomaster_yamaha(usalp, dp, FALSE) >= 0)
dp->cdr_flags |= CDR_AUDIOMASTER;
/*
@@ -830,7 +830,7 @@
if ((mp->p_len+2) >= (unsigned)28)
dp->cdr_flags |= CDR_FORCESPEED;
- if (get_tattoo_yamaha(scgp, FALSE, 0, 0))
+ if (get_tattoo_yamaha(usalp, FALSE, 0, 0))
dp->cdr_flags |= CDR_DISKTATTOO;
}
@@ -845,15 +845,15 @@
if (val == 0)
val = 372;
- scgp->verbose++;
- if (scsi_set_speed(scgp, -1, val, ROTCTL_CAV) < 0) {
+ usalp->verbose++;
+ if (scsi_set_speed(usalp, -1, val, ROTCTL_CAV) < 0) {
fprintf(stderr, "XXX\n");
}
- scgp->verbose--;
+ usalp->verbose--;
}
#endif
- check_writemodes_mmc(scgp, dp);
+ check_writemodes_mmc(usalp, dp);
if (driveropts != NULL) {
char *p;
@@ -894,7 +894,7 @@
}
p = hasdrvopt(driveropts, "tattooinfo");
if (p != NULL && *p == '1' && (dp->cdr_flags & CDR_DISKTATTOO) != 0) {
- get_tattoo_yamaha(scgp, TRUE, 0, 0);
+ get_tattoo_yamaha(usalp, TRUE, 0, 0);
}
p = hasdrvopt(driveropts, "tattoofile");
if (p != NULL && (dp->cdr_flags & CDR_DISKTATTOO) != 0) {
@@ -903,7 +903,7 @@
if ((f = fileopen(p, "rb")) == NULL)
comerr("Cannot open '%s'.\n", p);
- if (do_tattoo_yamaha(scgp, f) < 0)
+ if (do_tattoo_yamaha(usalp, f) < 0)
errmsgno(EX_BAD, "Cannot do DiskT at 2.\n");
fclose(f);
}
@@ -933,7 +933,7 @@
}
}
- if ((ret = get_supported_cdrw_media_types(scgp)) < 0) {
+ if ((ret = get_supported_cdrw_media_types(usalp)) < 0) {
dp->cdr_cdrw_support = CDR_CDRW_ALL;
return (0);
}
@@ -945,16 +945,16 @@
}
static int
-attach_mdvd(SCSI *scgp, cdr_t *dp)
+attach_mdvd(SCSI *usalp, cdr_t *dp)
{
struct cd_mode_page_2A *mp;
- allow_atapi(scgp, TRUE);/* Try to switch to 10 byte mode cmds */
+ allow_atapi(usalp, TRUE);/* Try to switch to 10 byte mode cmds */
- scgp->silent++;
- mp = mmc_cap(scgp, NULL);/* Get MMC capabilities in allocated mp */
- scgp->silent--;
+ usalp->silent++;
+ mp = mmc_cap(usalp, NULL);/* Get MMC capabilities in allocated mp */
+ usalp->silent--;
if (mp == NULL)
return (-1); /* Pre SCSI-3/mmc drive */
@@ -968,7 +968,7 @@
if (mp->BUF != 0)
dp->cdr_flags |= CDR_BURNFREE;
- check_writemodes_mdvd(scgp, dp);
+ check_writemodes_mdvd(usalp, dp);
if (driveropts != NULL) {
if (strcmp(driveropts, "help") == 0) {
@@ -980,7 +980,7 @@
}
int
-check_writemodes_mmc(SCSI *scgp, cdr_t *dp)
+check_writemodes_mmc(SCSI *usalp, cdr_t *dp)
{
Uchar mode[0x100];
int len;
@@ -992,18 +992,18 @@
/*
* Reset mp->test_write (-dummy) here.
*/
- deflt_writemodes_mmc(scgp, TRUE);
+ deflt_writemodes_mmc(usalp, TRUE);
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- scgp->silent++;
- if (!get_mode_params(scgp, 0x05, "CD write parameter",
+ usalp->silent++;
+ if (!get_mode_params(usalp, 0x05, "CD write parameter",
mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
- scgp->silent--;
+ usalp->silent--;
return (-1);
}
if (len == 0) {
- scgp->silent--;
+ usalp->silent--;
return (-1);
}
@@ -1011,7 +1011,7 @@
(mode + sizeof (struct scsi_mode_header) +
((struct scsi_mode_header *)mode)->blockdesc_len);
#ifdef DEBUG
- scg_prbytes("CD write parameter:", (Uchar *)mode, len);
+ usal_prbytes("CD write parameter:", (Uchar *)mode, len);
#endif
/*
@@ -1024,7 +1024,7 @@
mp->track_mode = TM_DATA;
mp->dbtype = DB_ROM_MODE1;
- if (set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
+ if (set_mode_params(usalp, "CD write parameter", mode, len, 0, -1)) {
dp->cdr_flags |= CDR_TAO;
if (xdebug)
printf("TAO ");
@@ -1038,7 +1038,7 @@
mp->fp = 0;
i_to_4_byte(mp->packet_size, 0);
- if (set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
+ if (set_mode_params(usalp, "CD write parameter", mode, len, 0, -1)) {
dp->cdr_flags |= CDR_PACKET;
if (xdebug)
printf("PACKET ");
@@ -1049,7 +1049,7 @@
mp->track_mode = TM_DATA;
mp->write_type = WT_SAO;
- if (set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
+ if (set_mode_params(usalp, "CD write parameter", mode, len, 0, -1)) {
dp->cdr_flags |= CDR_SAO;
if (xdebug)
printf("SAO ");
@@ -1060,7 +1060,7 @@
mp->dbtype = DB_RAW_PQ;
#ifdef __needed__
- if (set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
+ if (set_mode_params(usalp, "CD write parameter", mode, len, 0, -1)) {
dp->cdr_flags |= CDR_SRAW16;
if (xdebug)
printf("SAO/R16 ");
@@ -1069,7 +1069,7 @@
mp->dbtype = DB_RAW_PW;
- if (set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
+ if (set_mode_params(usalp, "CD write parameter", mode, len, 0, -1)) {
dp->cdr_flags |= CDR_SRAW96P;
if (xdebug)
printf("SAO/R96P ");
@@ -1077,7 +1077,7 @@
mp->dbtype = DB_RAW_PW_R;
- if (set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
+ if (set_mode_params(usalp, "CD write parameter", mode, len, 0, -1)) {
dp->cdr_flags |= CDR_SRAW96R;
if (xdebug)
printf("SAO/R96R ");
@@ -1087,7 +1087,7 @@
mp->write_type = WT_RAW;
mp->dbtype = DB_RAW_PQ;
- if (set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
+ if (set_mode_params(usalp, "CD write parameter", mode, len, 0, -1)) {
dp->cdr_flags |= CDR_RAW;
dp->cdr_flags |= CDR_RAW16;
if (xdebug)
@@ -1096,7 +1096,7 @@
mp->dbtype = DB_RAW_PW;
- if (set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
+ if (set_mode_params(usalp, "CD write parameter", mode, len, 0, -1)) {
dp->cdr_flags |= CDR_RAW;
dp->cdr_flags |= CDR_RAW96P;
if (xdebug)
@@ -1105,7 +1105,7 @@
mp->dbtype = DB_RAW_PW_R;
- if (set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
+ if (set_mode_params(usalp, "CD write parameter", mode, len, 0, -1)) {
dp->cdr_flags |= CDR_RAW;
dp->cdr_flags |= CDR_RAW96R;
if (xdebug)
@@ -1118,14 +1118,14 @@
/*
* Reset mp->test_write (-dummy) here.
*/
- deflt_writemodes_mmc(scgp, TRUE);
- scgp->silent--;
+ deflt_writemodes_mmc(usalp, TRUE);
+ usalp->silent--;
return (0);
}
int
-check_writemodes_mdvd(SCSI *scgp, cdr_t *dp)
+check_writemodes_mdvd(SCSI *usalp, cdr_t *dp)
{
Uchar mode[0x100];
int len;
@@ -1134,18 +1134,18 @@
if (xdebug)
printf("Checking possible write modes: ");
- deflt_writemodes_mdvd(scgp, FALSE);
+ deflt_writemodes_mdvd(usalp, FALSE);
fillbytes((caddr_t)mode, sizeof(mode), '\0');
- scgp->silent++;
- if (!get_mode_params(scgp, 0x05, "DVD write parameter",
+ usalp->silent++;
+ if (!get_mode_params(usalp, 0x05, "DVD write parameter",
mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
- scgp->silent--;
+ usalp->silent--;
return (-1);
}
if (len == 0) {
- scgp->silent--;
+ usalp->silent--;
return (-1);
}
@@ -1164,7 +1164,7 @@
mp->fp = 0;
i_to_4_byte(mp->packet_size, 0);
- if (set_mode_params(scgp, "DVD write parameter", mode, len, 0, -1)) {
+ if (set_mode_params(usalp, "DVD write parameter", mode, len, 0, -1)) {
dp->cdr_flags |= CDR_PACKET;
if (xdebug)
printf("PACKET ");
@@ -1177,7 +1177,7 @@
mp->write_type = WT_SAO;
- if (set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
+ if (set_mode_params(usalp, "CD write parameter", mode, len, 0, -1)) {
dp->cdr_flags |= CDR_SAO;
if (xdebug)
printf("SAO ");
@@ -1188,13 +1188,13 @@
if (xdebug)
printf("\n");
- deflt_writemodes_mdvd(scgp, TRUE);
- scgp->silent--;
+ deflt_writemodes_mdvd(usalp, TRUE);
+ usalp->silent--;
return (0);
}
static int
-deflt_writemodes_mmc(SCSI *scgp, BOOL reset_dummy)
+deflt_writemodes_mmc(SCSI *usalp, BOOL reset_dummy)
{
Uchar mode[0x100];
int len;
@@ -1202,14 +1202,14 @@
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- scgp->silent++;
- if (!get_mode_params(scgp, 0x05, "CD write parameter",
+ usalp->silent++;
+ if (!get_mode_params(usalp, 0x05, "CD write parameter",
mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
- scgp->silent--;
+ usalp->silent--;
return (-1);
}
if (len == 0) {
- scgp->silent--;
+ usalp->silent--;
return (-1);
}
@@ -1217,7 +1217,7 @@
(mode + sizeof (struct scsi_mode_header) +
((struct scsi_mode_header *)mode)->blockdesc_len);
#ifdef DEBUG
- scg_prbytes("CD write parameter:", (Uchar *)mode, len);
+ usal_prbytes("CD write parameter:", (Uchar *)mode, len);
fprintf(stderr, "Audio pause len: %d\n", a_to_2_byte(mp->audio_pause_len));
#endif
@@ -1245,9 +1245,9 @@
i_to_2_byte(mp->audio_pause_len, 150); /* LG has illegal def. value */
#ifdef DEBUG
- scg_prbytes("CD write parameter:", (Uchar *)mode, len);
+ usal_prbytes("CD write parameter:", (Uchar *)mode, len);
#endif
- if (!set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
+ if (!set_mode_params(usalp, "CD write parameter", mode, len, 0, -1)) {
mp->write_type = WT_SAO;
mp->LS_V = 0;
@@ -1256,17 +1256,17 @@
mp->multi_session = MS_NONE;
mp->host_appl_code = 0;
- if (!set_mode_params(scgp, "CD write parameter", mode, len, 0, -1)) {
- scgp->silent--;
+ if (!set_mode_params(usalp, "CD write parameter", mode, len, 0, -1)) {
+ usalp->silent--;
return (-1);
}
}
- scgp->silent--;
+ usalp->silent--;
return (0);
}
static int
-deflt_writemodes_mdvd(SCSI *scgp, BOOL reset_dummy)
+deflt_writemodes_mdvd(SCSI *usalp, BOOL reset_dummy)
{
Uchar mode[0x100];
int len;
@@ -1274,14 +1274,14 @@
fillbytes((caddr_t)mode, sizeof(mode), '\0');
- scgp->silent++;
- if (!get_mode_params(scgp, 0x05, "DVD write parameter",
+ usalp->silent++;
+ if (!get_mode_params(usalp, 0x05, "DVD write parameter",
mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
- scgp->silent--;
+ usalp->silent--;
return (-1);
}
if (len == 0) {
- scgp->silent--;
+ usalp->silent--;
return (-1);
}
@@ -1310,22 +1310,22 @@
mp->session_format = SES_DA_ROM;
- if (set_mode_params(scgp, "DVD write parameter", mode, len, 0, -1) < 0) {
- scgp->silent--;
+ if (set_mode_params(usalp, "DVD write parameter", mode, len, 0, -1) < 0) {
+ usalp->silent--;
return (-1);
}
- scgp->silent--;
+ usalp->silent--;
return (0);
}
#ifdef PRINT_ATIP
static void print_di(struct disk_info *dip);
static void atip_printspeed(char *fmt, int speedindex, char speedtab[]);
-static void print_atip(SCSI *scgp, struct atipinfo *atp);
+static void print_atip(SCSI *usalp, struct atipinfo *atp);
#endif /* PRINT_ATIP */
static int
-get_diskinfo(SCSI *scgp, struct disk_info *dip)
+get_diskinfo(SCSI *usalp, struct disk_info *dip)
{
int len;
int ret;
@@ -1336,16 +1336,16 @@
* Used to be 2 instead of 4 (now). But some Y2k ATAPI drives as used
* by IOMEGA create a DMA overrun if we try to transfer only 2 bytes.
*/
-/* if (read_disk_info(scgp, (caddr_t)dip, 2) < 0)*/
- if (read_disk_info(scgp, (caddr_t)dip, 4) < 0)
+/* if (read_disk_info(usalp, (caddr_t)dip, 2) < 0)*/
+ if (read_disk_info(usalp, (caddr_t)dip, 4) < 0)
return (-1);
len = a_to_u_2_byte(dip->data_len);
len += 2;
- ret = read_disk_info(scgp, (caddr_t)dip, len);
+ ret = read_disk_info(usalp, (caddr_t)dip, len);
#ifdef DEBUG
- scg_prbytes("Disk info:", (Uchar *)dip,
- len-scg_getresid(scgp));
+ usal_prbytes("Disk info:", (Uchar *)dip,
+ len-usal_getresid(usalp));
#endif
return (ret);
}
@@ -1389,7 +1389,7 @@
}
static int
-get_atip(SCSI *scgp, struct atipinfo *atp)
+get_atip(SCSI *usalp, struct atipinfo *atp)
{
int len;
int ret;
@@ -1402,15 +1402,15 @@
* some Y2k ATAPI drives as used by IOMEGA create a DMA overrun if we
* try to transfer only 2 bytes.
*/
- if (read_toc(scgp, (caddr_t)atp, 0, sizeof (struct tocheader), 0, FMT_ATIP) < 0)
+ if (read_toc(usalp, (caddr_t)atp, 0, sizeof (struct tocheader), 0, FMT_ATIP) < 0)
return (-1);
len = a_to_u_2_byte(atp->hd.len);
len += 2;
- ret = read_toc(scgp, (caddr_t)atp, 0, len, 0, FMT_ATIP);
+ ret = read_toc(usalp, (caddr_t)atp, 0, len, 0, FMT_ATIP);
#ifdef DEBUG
- scg_prbytes("ATIP info:", (Uchar *)atp,
- len-scg_getresid(scgp));
+ usal_prbytes("ATIP info:", (Uchar *)atp,
+ len-usal_getresid(usalp));
#endif
/*
* Yamaha sometimes returns zeroed ATIP info for disks without ATIP
@@ -1443,7 +1443,7 @@
#ifdef PRINT_ATIP
static int
-get_pma(SCSI *scgp)
+get_pma(SCSI *usalp)
{
int len;
int ret;
@@ -1457,25 +1457,25 @@
* some Y2k ATAPI drives as used by IOMEGA create a DMA overrun if we
* try to transfer only 2 bytes.
*/
-/* if (read_toc(scgp, (caddr_t)atp, 0, 2, 1, FMT_PMA) < 0)*/
-/* if (read_toc(scgp, (caddr_t)atp, 0, 2, 0, FMT_PMA) < 0)*/
- if (read_toc(scgp, (caddr_t)atp, 0, sizeof (struct tocheader), 0, FMT_PMA) < 0)
+/* if (read_toc(usalp, (caddr_t)atp, 0, 2, 1, FMT_PMA) < 0)*/
+/* if (read_toc(usalp, (caddr_t)atp, 0, 2, 0, FMT_PMA) < 0)*/
+ if (read_toc(usalp, (caddr_t)atp, 0, sizeof (struct tocheader), 0, FMT_PMA) < 0)
return (-1);
/* len = a_to_u_2_byte(atp->hd.len);*/
len = a_to_u_2_byte(atp);
len += 2;
-/* ret = read_toc(scgp, (caddr_t)atp, 0, len, 1, FMT_PMA);*/
- ret = read_toc(scgp, (caddr_t)atp, 0, len, 0, FMT_PMA);
+/* ret = read_toc(usalp, (caddr_t)atp, 0, len, 1, FMT_PMA);*/
+ ret = read_toc(usalp, (caddr_t)atp, 0, len, 0, FMT_PMA);
#ifdef DEBUG
- scg_prbytes("PMA:", (Uchar *)atp,
- len-scg_getresid(scgp));
+ usal_prbytes("PMA:", (Uchar *)atp,
+ len-usal_getresid(usalp));
#endif
- ret = read_toc(scgp, (caddr_t)atp, 0, len, 1, FMT_PMA);
+ ret = read_toc(usalp, (caddr_t)atp, 0, len, 1, FMT_PMA);
#ifdef DEBUG
- scg_prbytes("PMA:", (Uchar *)atp,
- len-scg_getresid(scgp));
+ usal_prbytes("PMA:", (Uchar *)atp,
+ len-usal_getresid(usalp));
#endif
return (ret);
}
@@ -1483,24 +1483,24 @@
#endif /* PRINT_ATIP */
static int
-init_mmc(SCSI *scgp, cdr_t *dp)
+init_mmc(SCSI *usalp, cdr_t *dp)
{
- return (speed_select_mmc(scgp, dp, NULL));
+ return (speed_select_mmc(usalp, dp, NULL));
}
static int
-getdisktype_mdvd(SCSI *scgp, cdr_t *dp)
+getdisktype_mdvd(SCSI *usalp, cdr_t *dp)
{
int ret = 0;
dstat_t *dsp = dp->cdr_dstat;
struct track_info track_info;
- if(getdisktype_mmc(scgp, dp)<0)
+ if(getdisktype_mmc(usalp, dp)<0)
return -1;
/* read rzone info to get the space left on disk */
/*ds_trlast is the last rzone on disk, can be invisible */
- if(read_rzone_info(scgp, (caddr_t)&track_info, sizeof(track_info))>=0)
+ if(read_rzone_info(usalp, (caddr_t)&track_info, sizeof(track_info))>=0)
dsp->ds_maxblocks=a_to_u_4_byte(track_info.free_blocks)+a_to_4_byte(track_info.next_writable_addr);
dsp->ds_disktype&= ~DT_CD;
@@ -1511,7 +1511,7 @@
}
static int
-getdisktype_mmc(SCSI *scgp, cdr_t *dp)
+getdisktype_mmc(SCSI *usalp, cdr_t *dp)
{
extern char *buf;
dstat_t *dsp = dp->cdr_dstat;
@@ -1530,8 +1530,8 @@
* Also if a NON CD-R media is inserted, this will never work.
* For this reason, make a failure non-fatal.
*/
- scgp->silent++;
- if (get_atip(scgp, (struct atipinfo *)mode) >= 0) {
+ usalp->silent++;
+ if (get_atip(usalp, (struct atipinfo *)mode) >= 0) {
struct atipinfo *atp = (struct atipinfo *)mode;
msf.msf_min = mode[8];
@@ -1570,11 +1570,11 @@
}
did_atip = TRUE;
}
- scgp->silent--;
+ usalp->silent--;
#ifdef PRINT_ATIP
if ((dp->cdr_dstat->ds_cdrflags & RF_PRATIP) != 0 && did_atip) {
- print_atip(scgp, (struct atipinfo *)mode);
+ print_atip(usalp, (struct atipinfo *)mode);
pr_manufacturer(&msf,
((struct atipinfo *)mode)->desc.erasable,
((struct atipinfo *)mode)->desc.uru);
@@ -1582,7 +1582,7 @@
#endif
again:
dip = (struct disk_info *)buf;
- if (get_diskinfo(scgp, dip) < 0)
+ if (get_diskinfo(usalp, dip) < 0)
return (-1);
/*
@@ -1608,7 +1608,7 @@
printf("Trying to clear drive status.\n");
dp->cdr_cmdflags &= ~F_DUMMY;
- speed_select_mmc(scgp, dp, &xspeed);
+ speed_select_mmc(usalp, dp, &xspeed);
dp->cdr_cmdflags = oflags;
did_dummy = TRUE;
goto again;
@@ -1616,9 +1616,9 @@
/*
* Trying to clear drive status did not work...
*/
- reload_media(scgp, dp);
+ reload_media(usalp, dp);
}
- if (get_diskinfo(scgp, dip) < 0)
+ if (get_diskinfo(usalp, dip) < 0)
return (-1);
di_to_dstat(dip, dsp);
if (!did_atip && dsp->ds_first_leadin < 0)
@@ -1638,7 +1638,7 @@
#ifdef PRINT_ATIP
#ifdef DEBUG
- if (get_atip(scgp, (struct atipinfo *)mode) < 0)
+ if (get_atip(usalp, (struct atipinfo *)mode) < 0)
return (-1);
/*
* Get pma gibt Ärger mit CW-7502
@@ -1655,10 +1655,10 @@
msf_to_lba(mode[12], mode[13], mode[14], TRUE),
mode[12], mode[13], mode[14]);
print_di(dip);
- print_atip(scgp, (struct atipinfo *)mode);
+ print_atip(usalp, (struct atipinfo *)mode);
#endif
#endif /* PRINT_ATIP */
- return (drive_getdisktype(scgp, dp));
+ return (drive_getdisktype(usalp, dp));
}
#ifdef PRINT_ATIP
@@ -1750,13 +1750,13 @@
}
static void
-print_atip(SCSI *scgp, struct atipinfo *atp)
+print_atip(SCSI *usalp, struct atipinfo *atp)
{
char *sub_type;
char *speedvtab = clv_to_speed;
- if (scgp->verbose)
- scg_prbytes("ATIP info: ", (Uchar *)atp, sizeof (*atp));
+ if (usalp->verbose)
+ usal_prbytes("ATIP info: ", (Uchar *)atp, sizeof (*atp));
printf("ATIP info from disk:\n");
printf(" Indicated writing power: %d\n", atp->desc.ind_wr_power);
@@ -1842,7 +1842,7 @@
#endif /* PRINT_ATIP */
static int
-speed_select_mmc(SCSI *scgp, cdr_t *dp, int *speedp)
+speed_select_mmc(SCSI *usalp, cdr_t *dp, int *speedp)
{
Uchar mode[0x100];
Uchar moder[0x100];
@@ -1859,11 +1859,11 @@
/*
* Do not reset mp->test_write (-dummy) here.
*/
- deflt_writemodes_mmc(scgp, FALSE);
+ deflt_writemodes_mmc(usalp, FALSE);
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- if (!get_mode_params(scgp, 0x05, "CD write parameter",
+ if (!get_mode_params(usalp, 0x05, "CD write parameter",
mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len))
return (-1);
if (len == 0)
@@ -1873,16 +1873,16 @@
(mode + sizeof (struct scsi_mode_header) +
((struct scsi_mode_header *)mode)->blockdesc_len);
#ifdef DEBUG
- scg_prbytes("CD write parameter:", (Uchar *)mode, len);
+ usal_prbytes("CD write parameter:", (Uchar *)mode, len);
#endif
mp->test_write = dummy != 0;
#ifdef DEBUG
- scg_prbytes("CD write parameter:", (Uchar *)mode, len);
+ usal_prbytes("CD write parameter:", (Uchar *)mode, len);
#endif
- if (!set_mode_params(scgp, "CD write parameter", mode, len, 0, -1))
+ if (!set_mode_params(usalp, "CD write parameter", mode, len, 0, -1))
return (-1);
/*
@@ -1892,13 +1892,13 @@
return (0);
- rp = get_justlink_ricoh(scgp, moder);
- if (mmc_isyamaha(scgp)) {
+ rp = get_justlink_ricoh(usalp, moder);
+ if (mmc_isyamaha(usalp)) {
forcespeed = FALSE;
- } else if (mmc_isplextor(scgp) && (dp->cdr_flags & CDR_FORCESPEED) != 0) {
+ } else if (mmc_isplextor(usalp) && (dp->cdr_flags & CDR_FORCESPEED) != 0) {
int pwr;
- pwr = check_powerrec_plextor(scgp);
+ pwr = check_powerrec_plextor(usalp);
if (pwr >= 0)
forcespeed = (pwr == 0);
} else if ((dp->cdr_flags & CDR_FORCESPEED) != 0) {
@@ -1916,15 +1916,15 @@
printf("Turning forcespeed off\n");
forcespeed = FALSE;
}
- if (mmc_isplextor(scgp) && (dp->cdr_flags & CDR_FORCESPEED) != 0) {
- powerrec_plextor(scgp, !forcespeed);
+ if (mmc_isplextor(usalp) && (dp->cdr_flags & CDR_FORCESPEED) != 0) {
+ powerrec_plextor(usalp, !forcespeed);
}
- if (!mmc_isyamaha(scgp) && (dp->cdr_flags & CDR_FORCESPEED) != 0) {
+ if (!mmc_isyamaha(usalp) && (dp->cdr_flags & CDR_FORCESPEED) != 0) {
if (rp) {
rp->AWSCD = forcespeed?1:0;
- set_mode_params(scgp, "Ricoh Vendor Page", moder, moder[0]+1, 0, -1);
- rp = get_justlink_ricoh(scgp, moder);
+ set_mode_params(usalp, "Ricoh Vendor Page", moder, moder[0]+1, 0, -1);
+ rp = get_justlink_ricoh(usalp, moder);
}
}
@@ -1940,14 +1940,14 @@
val = curspeed*177;
if (val > 0xFFFF)
val = 0xFFFF;
- if (mmc_isyamaha(scgp) && forcespeed) {
- if (force_speed_yamaha(scgp, -1, val) < 0)
+ if (mmc_isyamaha(usalp) && forcespeed) {
+ if (force_speed_yamaha(usalp, -1, val) < 0)
return (-1);
- } else if (mmc_set_speed(scgp, -1, val, ROTCTL_CLV) < 0) {
+ } else if (mmc_set_speed(usalp, -1, val, ROTCTL_CLV) < 0) {
return (-1);
}
- if (scsi_get_speed(scgp, 0, &val) >= 0) {
+ if (scsi_get_speed(usalp, 0, &val) >= 0) {
if (val > 0) {
printf("Speed set to %d KB/s\n", val);
curspeed = val / 176;
@@ -1963,7 +1963,7 @@
* the write speed unti it gets accepted by the drive.
*/
static int
-mmc_set_speed(SCSI *scgp, int readspeed, int writespeed, int rotctl)
+mmc_set_speed(SCSI *usalp, int readspeed, int writespeed, int rotctl)
{
int rs;
int ws;
@@ -1971,7 +1971,7 @@
int c;
int k;
- if (scsi_get_speed(scgp, &rs, &ws) >= 0) {
+ if (scsi_get_speed(usalp, &rs, &ws) >= 0) {
if (readspeed < 0)
readspeed = rs;
if (writespeed < 0)
@@ -1980,35 +1980,35 @@
if (writespeed < 0 || writespeed > 0xFFFF)
return (ret);
- scgp->silent++;
+ usalp->silent++;
while (writespeed <= 0xFFFF) {
- ret = scsi_set_speed(scgp, readspeed, writespeed, rotctl);
+ ret = scsi_set_speed(usalp, readspeed, writespeed, rotctl);
if (ret >= 0)
break;
- c = scg_sense_code(scgp);
- k = scg_sense_key(scgp);
+ c = usal_sense_code(usalp);
+ k = usal_sense_key(usalp);
/*
* Abort quickly if it does not make sense to repeat.
* 0x24 == Invalid field in cdb
* 0x24 means illegal speed.
*/
if ((k != SC_ILLEGAL_REQUEST) || (c != 0x24)) {
- if (scgp->silent <= 1)
- scg_printerr(scgp);
- scgp->silent--;
+ if (usalp->silent <= 1)
+ usal_printerr(usalp);
+ usalp->silent--;
return (-1);
}
writespeed += 177;
}
- if (ret < 0 && scgp->silent <= 1)
- scg_printerr(scgp);
- scgp->silent--;
+ if (ret < 0 && usalp->silent <= 1)
+ usal_printerr(usalp);
+ usalp->silent--;
return (ret);
}
static int
-speed_select_mdvd(SCSI *scgp, cdr_t *dp, int *speedp)
+speed_select_mdvd(SCSI *usalp, cdr_t *dp, int *speedp)
{
int retcode;
char perf_desc[28];
@@ -2055,17 +2055,17 @@
perf_desc[26] = 1000 >> 8;
perf_desc[27] = 1000 & 0xFF;
- /* retcode = scsi_set_streaming(scgp, NULL, 0); */
- retcode = scsi_set_streaming(scgp, perf_desc, sizeof(perf_desc));
+ /* retcode = scsi_set_streaming(usalp, NULL, 0); */
+ retcode = scsi_set_streaming(usalp, perf_desc, sizeof(perf_desc));
if (retcode == -1) return retcode;
- retcode = speed_select_mmc(scgp, dp, speedp);
+ retcode = speed_select_mmc(usalp, dp, speedp);
if(speedp!=NULL)
(*speedp)=(*speedp)/7;
return retcode;
}
static int
-next_wr_addr_mmc(SCSI *scgp, track_t *trackp, long *ap)
+next_wr_addr_mmc(SCSI *usalp, track_t *trackp, long *ap)
{
struct track_info track_info;
long next_addr;
@@ -2079,15 +2079,15 @@
*/
if (trackp != 0 && trackp->track > 0 && is_packet(trackp)) {
- scgp->silent++;
- result = read_track_info(scgp, (caddr_t)&track_info, TI_TYPE_TRACK,
+ usalp->silent++;
+ result = read_track_info(usalp, (caddr_t)&track_info, TI_TYPE_TRACK,
trackp->trackno,
sizeof (track_info));
- scgp->silent--;
+ usalp->silent--;
}
if (result < 0) {
- if (read_track_info(scgp, (caddr_t)&track_info, TI_TYPE_TRACK, 0xFF,
+ if (read_track_info(usalp, (caddr_t)&track_info, TI_TYPE_TRACK, 0xFF,
sizeof (track_info)) < 0) {
errmsgno(EX_BAD, "Cannot get next writable address for 'invisible' track.\n");
errmsgno(EX_BAD, "This means that we are checking recorded media.\n");
@@ -2096,9 +2096,9 @@
return (-1);
}
}
- if (scgp->verbose)
- scg_prbytes("track info:", (Uchar *)&track_info,
- sizeof (track_info)-scg_getresid(scgp));
+ if (usalp->verbose)
+ usal_prbytes("track info:", (Uchar *)&track_info,
+ sizeof (track_info)-usal_getresid(usalp));
next_addr = a_to_4_byte(track_info.next_writable_addr);
if (ap)
*ap = next_addr;
@@ -2106,7 +2106,7 @@
}
static int
-write_leadin_mmc(SCSI *scgp, cdr_t *dp, track_t *trackp)
+write_leadin_mmc(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
Uint i;
long startsec = 0L;
@@ -2117,12 +2117,12 @@
printf("Sending CUE sheet...\n");
flush();
}
- if ((*dp->cdr_send_cue)(scgp, dp, trackp) < 0) {
+ if ((*dp->cdr_send_cue)(usalp, dp, trackp) < 0) {
errmsgno(EX_BAD, "Cannot send CUE sheet.\n");
return (-1);
}
- (*dp->cdr_next_wr_address)(scgp, &trackp[0], &startsec);
+ (*dp->cdr_next_wr_address)(usalp, &trackp[0], &startsec);
if (trackp[0].flags & TI_TEXT) {
startsec = dp->cdr_dstat->ds_first_leadin;
printf("SAO startsec: %ld\n", startsec);
@@ -2141,7 +2141,7 @@
}
if (debug || lverbose)
printf("Writing lead-in...\n");
- if (write_cdtext(scgp, dp, startsec) < 0)
+ if (write_cdtext(usalp, dp, startsec) < 0)
return (-1);
dp->cdr_dstat->ds_cdrflags |= RF_LEADIN;
@@ -2152,7 +2152,7 @@
if (debug || lverbose)
printf("Writing lead-in...\n");
- pad_track(scgp, dp, &trackp[1], -150, (Llong)0,
+ pad_track(usalp, dp, &trackp[1], -150, (Llong)0,
FALSE, 0);
#endif
}
@@ -2161,7 +2161,7 @@
/*
* In RAW write mode, we now write the lead in (TOC).
*/
- (*dp->cdr_next_wr_address)(scgp, &trackp[0], &startsec);
+ (*dp->cdr_next_wr_address)(usalp, &trackp[0], &startsec);
if (startsec > -4500) {
/*
* There must be at least 1 minute lead-in.
@@ -2176,7 +2176,7 @@
}
if (debug || lverbose)
printf("Writing lead-in at sector %ld\n", startsec);
- if (write_leadin(scgp, dp, trackp, startsec) < 0)
+ if (write_leadin(usalp, dp, trackp, startsec) < 0)
return (-1);
dp->cdr_dstat->ds_cdrflags |= RF_LEADIN;
}
@@ -2195,7 +2195,7 @@
};
static int
-next_wr_addr_mdvd(SCSI *scgp, track_t *trackp, long *ap)
+next_wr_addr_mdvd(SCSI *usalp, track_t *trackp, long *ap)
{
int track=0;
struct track_info track_info;
@@ -2207,10 +2207,10 @@
}
if (trackp != 0 && track > 0 && is_packet(trackp)) {
- scgp->silent++;
- result = read_track_info(scgp, (caddr_t)&track_info, TI_TYPE_SESS, track, sizeof(track_info));
- scgp->silent--;
- if (scsi_in_progress(scgp)){
+ usalp->silent++;
+ result = read_track_info(usalp, (caddr_t)&track_info, TI_TYPE_SESS, track, sizeof(track_info));
+ usalp->silent--;
+ if (scsi_in_progress(usalp)){
return -1;
}
@@ -2218,16 +2218,16 @@
if (result < 0) {
/* Get the last rzone*/
- if(read_disk_info(scgp,(caddr_t)&disk_info,8)<0)
+ if(read_disk_info(usalp,(caddr_t)&disk_info,8)<0)
return (-1);
- /* if (read_track_info(scgp, (caddr_t)&track_info, TI_TYPE_SESS, 0xFF, sizeof(track_info)) < 0) */
- if (read_rzone_info(scgp, (caddr_t)&track_info, sizeof(track_info)) < 0)
+ /* if (read_track_info(usalp, (caddr_t)&track_info, TI_TYPE_SESS, 0xFF, sizeof(track_info)) < 0) */
+ if (read_rzone_info(usalp, (caddr_t)&track_info, sizeof(track_info)) < 0)
return (-1);
}
- if (scgp->verbose)
- scg_prbytes("track info:", (Uchar *)&track_info,
- sizeof(track_info)-scg_getresid(scgp));
+ if (usalp->verbose)
+ usal_prbytes("track info:", (Uchar *)&track_info,
+ sizeof(track_info)-usal_getresid(usalp));
next_addr = a_to_4_byte(track_info.next_writable_addr);
if (ap)
*ap = next_addr;
@@ -2235,7 +2235,7 @@
}
static int
-open_track_mmc(SCSI *scgp, cdr_t *dp, track_t *trackp)
+open_track_mmc(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
Uchar mode[0x100];
int len;
@@ -2251,7 +2251,7 @@
/*
* XXX Do we need to check isecsize too?
*/
- pad_track(scgp, dp, trackp,
+ pad_track(usalp, dp, trackp,
trackp->trackstart-trackp->pregapsize,
(Llong)trackp->pregapsize*trackp->secsize,
FALSE, 0);
@@ -2261,7 +2261,7 @@
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- if (!get_mode_params(scgp, 0x05, "CD write parameter",
+ if (!get_mode_params(usalp, 0x05, "CD write parameter",
mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len))
return (-1);
if (len == 0)
@@ -2303,16 +2303,16 @@
}
#ifdef DEBUG
- scg_prbytes("CD write parameter:", (Uchar *)mode, len);
+ usal_prbytes("CD write parameter:", (Uchar *)mode, len);
#endif
- if (!set_mode_params(scgp, "CD write parameter", mode, len, 0, trackp->secsize))
+ if (!set_mode_params(usalp, "CD write parameter", mode, len, 0, trackp->secsize))
return (-1);
return (0);
}
static int
-open_track_mdvd(SCSI *scgp, cdr_t *dp, track_t *trackp)
+open_track_mdvd(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
Uchar mode[0x100];
int len;
@@ -2321,7 +2321,7 @@
if (is_packet(trackp)) {
fillbytes((caddr_t)mode, sizeof(mode), '\0');
- if (!get_mode_params(scgp, 0x05, "DVD write parameter",
+ if (!get_mode_params(usalp, 0x05, "DVD write parameter",
mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len))
return (-1);
if (len == 0)
@@ -2341,51 +2341,51 @@
return 0;
}
- if (!set_mode_params(scgp, "CD write parameter", mode, len, 0, trackp->secsize))
+ if (!set_mode_params(usalp, "CD write parameter", mode, len, 0, trackp->secsize))
return (-1);
return (0);
}
static int
-close_track_mmc(SCSI *scgp, cdr_t *dp, track_t *trackp)
+close_track_mmc(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
int ret;
if (!is_tao(trackp) && !is_packet(trackp))
return (0);
- if (scsi_flush_cache(scgp, (dp->cdr_cmdflags&F_IMMED) != 0) < 0) {
+ if (scsi_flush_cache(usalp, (dp->cdr_cmdflags&F_IMMED) != 0) < 0) {
printf("Trouble flushing the cache\n");
return (-1);
}
- wait_unit_ready(scgp, 300); /* XXX Wait for ATAPI */
+ wait_unit_ready(usalp, 300); /* XXX Wait for ATAPI */
if (is_packet(trackp) && !is_noclose(trackp)) {
/* close the incomplete track */
- ret = scsi_close_tr_session(scgp, CL_TYPE_TRACK, 0xFF,
+ ret = scsi_close_tr_session(usalp, CL_TYPE_TRACK, 0xFF,
(dp->cdr_cmdflags&F_IMMED) != 0);
- wait_unit_ready(scgp, 300); /* XXX Wait for ATAPI */
+ wait_unit_ready(usalp, 300); /* XXX Wait for ATAPI */
return (ret);
}
return (0);
}
static int
-close_track_mdvd(SCSI *scgp, cdr_t *dp, track_t *trackp)
+close_track_mdvd(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
int ret;
if (!is_packet(trackp))
return (0);
- if (scsi_flush_cache(scgp, (dp->cdr_cmdflags&F_IMMED) != 0) < 0) {
+ if (scsi_flush_cache(usalp, (dp->cdr_cmdflags&F_IMMED) != 0) < 0) {
printf("Trouble flushing the cache\n");
return -1;
}
- wait_unit_ready(scgp, 300); /* XXX Wait for ATAPI */
+ wait_unit_ready(usalp, 300); /* XXX Wait for ATAPI */
if (is_packet(trackp) && !is_noclose(trackp)) {
/* close the incomplete track */
- ret = scsi_close_tr_session(scgp, 1, 0xFF, (dp->cdr_cmdflags&F_IMMED) != 0);
- wait_unit_ready(scgp, 300); /* XXX Wait for ATAPI */
+ ret = scsi_close_tr_session(usalp, 1, 0xFF, (dp->cdr_cmdflags&F_IMMED) != 0);
+ wait_unit_ready(usalp, 300); /* XXX Wait for ATAPI */
return (ret);
}
return (0);
@@ -2402,7 +2402,7 @@
};
static int
-open_session_mmc(SCSI *scgp, cdr_t *dp, track_t *trackp)
+open_session_mmc(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
Uchar mode[0x100];
int len;
@@ -2410,7 +2410,7 @@
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- if (!get_mode_params(scgp, 0x05, "CD write parameter",
+ if (!get_mode_params(usalp, 0x05, "CD write parameter",
mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len))
return (-1);
if (len == 0)
@@ -2462,16 +2462,16 @@
fillbytes(&mp->media_cat_number[0], sizeof (mp->media_cat_number), '\0');
}
#ifdef DEBUG
- scg_prbytes("CD write parameter:", (Uchar *)mode, len);
+ usal_prbytes("CD write parameter:", (Uchar *)mode, len);
#endif
- if (!set_mode_params(scgp, "CD write parameter", mode, len, 0, -1))
+ if (!set_mode_params(usalp, "CD write parameter", mode, len, 0, -1))
return (-1);
return (0);
}
static int
-open_session_mdvd(SCSI *scgp, cdr_t *dp, track_t *trackp)
+open_session_mdvd(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
Uchar mode[0x100];
int tracks = trackp->tracks;
@@ -2484,7 +2484,7 @@
fillbytes((caddr_t)mode, sizeof(mode), '\0');
- if (!get_mode_params(scgp, 0x05, "DVD write parameter",
+ if (!get_mode_params(usalp, 0x05, "DVD write parameter",
mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len))
return (-1);
if (len == 0)
@@ -2528,7 +2528,7 @@
}
- if (!set_mode_params(scgp, "DVD write parameter", mode, len, 0, -1))
+ if (!set_mode_params(usalp, "DVD write parameter", mode, len, 0, -1))
return (-1);
@@ -2537,41 +2537,41 @@
totalsize+=trackp[i].tracksecs;
}
- profile = get_curprofile(scgp);
+ profile = get_curprofile(usalp);
if(!is_packet(trackp) && profile != 0x1A){
/* in DAO mode we need to reserve space for the track*/
- if(reserve_track(scgp, totalsize)<0)
+ if(reserve_track(usalp, totalsize)<0)
return (-1);
}
return (0);
}
static int
-waitfix_mmc(SCSI *scgp, int secs)
+waitfix_mmc(SCSI *usalp, int secs)
{
char dibuf[16];
int i;
int key;
#define W_SLEEP 2
- scgp->silent++;
+ usalp->silent++;
for (i = 0; i < secs/W_SLEEP; i++) {
- if (read_disk_info(scgp, dibuf, sizeof (dibuf)) >= 0) {
- scgp->silent--;
+ if (read_disk_info(usalp, dibuf, sizeof (dibuf)) >= 0) {
+ usalp->silent--;
return (0);
}
- key = scg_sense_key(scgp);
+ key = usal_sense_key(usalp);
if (key != SC_UNIT_ATTENTION && key != SC_NOT_READY)
break;
sleep(W_SLEEP);
}
- scgp->silent--;
+ usalp->silent--;
return (-1);
#undef W_SLEEP
}
static int
-fixate_mmc(SCSI *scgp, cdr_t *dp, track_t *trackp)
+fixate_mmc(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
int ret = 0;
int key = 0;
@@ -2590,31 +2590,31 @@
if (dummy && lverbose)
printf("WARNING: Some drives don't like fixation in dummy mode.\n");
- scgp->silent++;
+ usalp->silent++;
if(debug)
printf("is_tao: %d,is_packet: %d\n", is_tao(trackp), is_packet(trackp));
if (is_tao(trackp) || is_packet(trackp)) {
- ret = scsi_close_tr_session(scgp, CL_TYPE_SESSION, 0,
+ ret = scsi_close_tr_session(usalp, CL_TYPE_SESSION, 0,
(dp->cdr_cmdflags&F_IMMED) != 0);
} else {
- if (scsi_flush_cache(scgp, (dp->cdr_cmdflags&F_IMMED) != 0) < 0) {
- if (!scsi_in_progress(scgp))
+ if (scsi_flush_cache(usalp, (dp->cdr_cmdflags&F_IMMED) != 0) < 0) {
+ if (!scsi_in_progress(usalp))
printf("Trouble flushing the cache\n");
}
}
- scgp->silent--;
- key = scg_sense_key(scgp);
- code = scg_sense_code(scgp);
+ usalp->silent--;
+ key = usal_sense_key(usalp);
+ code = usal_sense_code(usalp);
- scgp->silent++;
- if (debug && !unit_ready(scgp)) {
+ usalp->silent++;
+ if (debug && !unit_ready(usalp)) {
fprintf(stderr, "Early return from fixating. Ret: %d Key: %d, Code: %d\n", ret, key, code);
}
- scgp->silent--;
+ usalp->silent--;
if (ret >= 0) {
- wait_unit_ready(scgp, 420/curspeed); /* XXX Wait for ATAPI */
- waitfix_mmc(scgp, 420/curspeed); /* XXX Wait for ATAPI */
+ wait_unit_ready(usalp, 420/curspeed); /* XXX Wait for ATAPI */
+ waitfix_mmc(usalp, 420/curspeed); /* XXX Wait for ATAPI */
return (ret);
}
@@ -2636,16 +2636,16 @@
* Try to supress the error message in this case to make
* simple minded users less confused.
*/
- scg_printerr(scgp);
- scg_printresult(scgp); /* XXX restore key/code in future */
+ usal_printerr(usalp);
+ usal_printresult(usalp); /* XXX restore key/code in future */
}
- if (debug && !unit_ready(scgp)) {
+ if (debug && !unit_ready(usalp)) {
fprintf(stderr, "Early return from fixating. Ret: %d Key: %d, Code: %d\n", ret, key, code);
}
- wait_unit_ready(scgp, 420); /* XXX Wait for ATAPI */
- waitfix_mmc(scgp, 420/curspeed); /* XXX Wait for ATAPI */
+ wait_unit_ready(usalp, 420); /* XXX Wait for ATAPI */
+ waitfix_mmc(usalp, 420/curspeed); /* XXX Wait for ATAPI */
if (!dummy &&
(ret >= 0 || (key == SC_UNIT_ATTENTION && code == 0x2E))) {
@@ -2676,23 +2676,23 @@
}
static int
-fixate_mdvd(SCSI *scgp, cdr_t *dp, track_t *trackp)
+fixate_mdvd(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
/*set a really BIG timeout and call fixate_mmc
The BIG timeout is needed in case there was a very short rzone to write at the
beginning of the disk, because lead-out needs to be at some distance.
*/
printf("fixate_mdvd\n");
- scg_settimeout(scgp, 1000);
+ usal_settimeout(usalp, 1000);
if(is_packet(trackp) || dp->profile == 0x1B){
- scsi_close_tr_session(scgp, CL_TYPE_SESSION, 0, FALSE);
+ scsi_close_tr_session(usalp, CL_TYPE_SESSION, 0, FALSE);
}
- fixate_mmc(scgp, dp, trackp);
+ fixate_mmc(usalp, dp, trackp);
if (dp->profile == 0x2B) {
- scsi_close_tr_session(scgp, CL_TYPE_OPEN_SESSION, 0, FALSE);
- scsi_close_tr_session(scgp, CL_TYPE_FINALISE_MINRAD, 0, FALSE);
+ scsi_close_tr_session(usalp, CL_TYPE_OPEN_SESSION, 0, FALSE);
+ scsi_close_tr_session(usalp, CL_TYPE_FINALISE_MINRAD, 0, FALSE);
}
- scg_settimeout(scgp, 200);
+ usal_settimeout(usalp, 200);
}
@@ -2714,7 +2714,7 @@
};
static int
-blank_mmc(SCSI *scgp, cdr_t *dp, long addr, int blanktype)
+blank_mmc(SCSI *usalp, cdr_t *dp, long addr, int blanktype)
{
BOOL cdrr = FALSE; /* Read CD-R */
BOOL cdwr = FALSE; /* Write CD-R */
@@ -2722,29 +2722,29 @@
BOOL cdwrw = FALSE; /* Write CD-RW */
int ret;
- mmc_check(scgp, &cdrr, &cdwr, &cdrrw, &cdwrw, NULL, NULL);
+ mmc_check(usalp, &cdrr, &cdwr, &cdrrw, &cdwrw, NULL, NULL);
if (!cdwrw)
- return (blank_dummy(scgp, dp, addr, blanktype));
+ return (blank_dummy(usalp, dp, addr, blanktype));
if (dp->profile == 0x1A) {
printf("Error: this media does not support blanking, ignoring.\n");
- return (blank_dummy(scgp, dp, addr, blanktype));
+ return (blank_dummy(usalp, dp, addr, blanktype));
}
if (lverbose) {
printf("Blanking %s\n", blank_types[blanktype & 0x07]);
flush();
}
- ret = scsi_blank(scgp, addr, blanktype, (dp->cdr_cmdflags&F_IMMED) != 0);
+ ret = scsi_blank(usalp, addr, blanktype, (dp->cdr_cmdflags&F_IMMED) != 0);
if (ret < 0)
return (ret);
- wait_unit_ready(scgp, 90*60/curspeed); /* XXX Wait for ATAPI */
- waitfix_mmc(scgp, 90*60/curspeed); /* XXX Wait for ATAPI */
+ wait_unit_ready(usalp, 90*60/curspeed); /* XXX Wait for ATAPI */
+ waitfix_mmc(usalp, 90*60/curspeed); /* XXX Wait for ATAPI */
return (ret);
}
-static int format_mdvd(SCSI *scgp, cdr_t *dp, int formattype)
+static int format_mdvd(SCSI *usalp, cdr_t *dp, int formattype)
{
extern char *buf;
BOOL dvdwr = FALSE; /* Write DVD */
@@ -2754,19 +2754,19 @@
struct disk_info *dip;
printf("format_mdvd\n");
- mmc_check(scgp, NULL, NULL, NULL, NULL, NULL, &dvdwr);
+ mmc_check(usalp, NULL, NULL, NULL, NULL, NULL, &dvdwr);
if (!dvdwr)
- return (format_dummy(scgp, dp, formattype));
+ return (format_dummy(usalp, dp, formattype));
printf("format_mdvd: drive is a dvd burner.\n");
- profile = get_curprofile(scgp);
+ profile = get_curprofile(usalp);
if (profile != 0x1A) {
printf("Error: only support DVD+RW formating, ignoring.\n");
- return (format_dummy(scgp, dp, formattype));
+ return (format_dummy(usalp, dp, formattype));
}
printf("format_mdvd: media is a DVD+RW.\n");
dip = (struct disk_info *)buf;
- if (get_diskinfo(scgp, dip) < 0)
+ if (get_diskinfo(usalp, dip) < 0)
return ret;
if (dip->disk_status & 3 && formattype != FORCE_FORMAT) {
@@ -2802,26 +2802,26 @@
flush();
}
if (formattype == FULL_FORMAT) {
- ret = scsi_format(scgp, &addr, sizeof(addr), FALSE);
+ ret = scsi_format(usalp, &addr, sizeof(addr), FALSE);
} else {
- ret = scsi_format(scgp, &addr, sizeof(addr), TRUE);
+ ret = scsi_format(usalp, &addr, sizeof(addr), TRUE);
}
if (ret < 0)
return (ret);
- wait_unit_ready(scgp, 90*60/curspeed); /* XXX Wait for ATAPI */
- waitfix_mmc(scgp, 90*60/curspeed); /* XXX Wait for ATAPI */
+ wait_unit_ready(usalp, 90*60/curspeed); /* XXX Wait for ATAPI */
+ waitfix_mmc(usalp, 90*60/curspeed); /* XXX Wait for ATAPI */
return (ret);
}
static int
-send_opc_mmc(SCSI *scgp, caddr_t bp, int cnt, int doopc)
+send_opc_mmc(SCSI *usalp, caddr_t bp, int cnt, int doopc)
{
int ret;
- scgp->silent++;
- ret = send_opc(scgp, bp, cnt, doopc);
- scgp->silent--;
+ usalp->silent++;
+ ret = send_opc(usalp, bp, cnt, doopc);
+ usalp->silent--;
if (ret >= 0)
return (ret);
@@ -2845,9 +2845,9 @@
* Sense flags: Blk 0 (not valid)
*/
/* END CSTYLED */
- if (scg_sense_key(scgp) == SC_UNIT_ATTENTION &&
- scg_sense_code(scgp) == 0x5A &&
- scg_sense_qual(scgp) == 0x03)
+ if (usal_sense_key(usalp) == SC_UNIT_ATTENTION &&
+ usal_sense_code(usalp) == 0x5A &&
+ usal_sense_qual(usalp) == 0x03)
return (0);
/*
@@ -2855,35 +2855,35 @@
* "Power calibration area almost full" a fatal error.
* It just flags that we have a single and last chance to write now.
*/
- if ((scg_sense_key(scgp) == SC_RECOVERABLE_ERROR ||
- scg_sense_key(scgp) == SC_MEDIUM_ERROR) &&
- scg_sense_code(scgp) == 0x73 &&
- scg_sense_qual(scgp) == 0x01)
+ if ((usal_sense_key(usalp) == SC_RECOVERABLE_ERROR ||
+ usal_sense_key(usalp) == SC_MEDIUM_ERROR) &&
+ usal_sense_code(usalp) == 0x73 &&
+ usal_sense_qual(usalp) == 0x01)
return (0);
/*
* Send OPC is optional.
*/
- if (scg_sense_key(scgp) != SC_ILLEGAL_REQUEST) {
- if (scgp->silent <= 0)
- scg_printerr(scgp);
+ if (usal_sense_key(usalp) != SC_ILLEGAL_REQUEST) {
+ if (usalp->silent <= 0)
+ usal_printerr(usalp);
return (ret);
}
return (0);
}
static int
-opt1_mmc(SCSI *scgp, cdr_t *dp)
+opt1_mmc(SCSI *usalp, cdr_t *dp)
{
int oflags = dp->cdr_dstat->ds_cdrflags;
if ((dp->cdr_dstat->ds_cdrflags & RF_AUDIOMASTER) != 0) {
printf("Turning Audio Master Q. R. on\n");
- if (set_audiomaster_yamaha(scgp, dp, TRUE) < 0)
+ if (set_audiomaster_yamaha(usalp, dp, TRUE) < 0)
return (-1);
if (!debug && lverbose <= 1)
dp->cdr_dstat->ds_cdrflags &= ~RF_PRATIP;
- if (getdisktype_mmc(scgp, dp) < 0) {
+ if (getdisktype_mmc(usalp, dp) < 0) {
dp->cdr_dstat->ds_cdrflags = oflags;
return (-1);
}
@@ -2904,18 +2904,18 @@
msf.msf_frame);
}
}
- if (mmc_isplextor(scgp)) {
+ if (mmc_isplextor(usalp)) {
int gcode;
if ((dp->cdr_flags & (CDR_SINGLESESS|CDR_HIDE_CDR)) != 0) {
- if (ss_hide_plextor(scgp,
+ if (ss_hide_plextor(usalp,
(dp->cdr_dstat->ds_cdrflags & RF_SINGLESESS) != 0,
(dp->cdr_dstat->ds_cdrflags & RF_HIDE_CDR) != 0) < 0)
return (-1);
}
if ((dp->cdr_flags & CDR_SPEEDREAD) != 0) {
- if (speed_rd_plextor(scgp,
+ if (speed_rd_plextor(usalp,
(dp->cdr_dstat->ds_cdrflags & RF_SPEEDREAD) != 0) < 0)
return (-1);
}
@@ -2923,9 +2923,9 @@
if ((dp->cdr_cmdflags & F_SETDROPTS) ||
(wm_base(dp->cdr_dstat->ds_wrmode) == WM_SAO) ||
(wm_base(dp->cdr_dstat->ds_wrmode) == WM_RAW))
- gcode = do_gigarec_plextor(scgp);
+ gcode = do_gigarec_plextor(usalp);
else
- gcode = gigarec_plextor(scgp, 0);
+ gcode = gigarec_plextor(usalp, 0);
if (gcode != 0) {
msf_t msf;
@@ -2954,7 +2954,7 @@
}
static int
-opt2_mmc(SCSI *scgp, cdr_t *dp)
+opt2_mmc(SCSI *usalp, cdr_t *dp)
{
Uchar mode[0x100];
Uchar moder[0x100];
@@ -2965,7 +2965,7 @@
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- if (!get_mode_params(scgp, 0x05, "CD write parameter",
+ if (!get_mode_params(usalp, 0x05, "CD write parameter",
mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len))
return (-1);
if (len == 0)
@@ -2976,7 +2976,7 @@
((struct scsi_mode_header *)mode)->blockdesc_len);
- rp = get_justlink_ricoh(scgp, moder);
+ rp = get_justlink_ricoh(usalp, moder);
if (dp->cdr_cdcap->BUF != 0) {
burnfree = mp->BUFE != 0;
@@ -3008,45 +3008,45 @@
*/
i_to_2_byte(rp->link_counter, 0);
if (xdebug)
- scg_prbytes("Mode Select Data ", moder, moder[0]+1);
+ usal_prbytes("Mode Select Data ", moder, moder[0]+1);
- if (!set_mode_params(scgp, "Ricoh Vendor Page", moder, moder[0]+1, 0, -1))
+ if (!set_mode_params(usalp, "Ricoh Vendor Page", moder, moder[0]+1, 0, -1))
return (-1);
- rp = get_justlink_ricoh(scgp, moder);
+ rp = get_justlink_ricoh(usalp, moder);
}
#ifdef DEBUG
- scg_prbytes("CD write parameter:", (Uchar *)mode, len);
+ usal_prbytes("CD write parameter:", (Uchar *)mode, len);
#endif
- if (!set_mode_params(scgp, "CD write parameter", mode, len, 0, -1))
+ if (!set_mode_params(usalp, "CD write parameter", mode, len, 0, -1))
return (-1);
- if (mmc_isplextor(scgp)) {
+ if (mmc_isplextor(usalp)) {
/*
* Clear Burn-Proof counter
*/
- scgp->silent++;
- bpc_plextor(scgp, 1, NULL);
- scgp->silent--;
+ usalp->silent++;
+ bpc_plextor(usalp, 1, NULL);
+ usalp->silent--;
- do_varirec_plextor(scgp);
+ do_varirec_plextor(usalp);
}
return (0);
}
static int
-opt1_mdvd(SCSI *scgp, cdr_t *dp)
+opt1_mdvd(SCSI *usalp, cdr_t *dp)
{
int oflags = dp->cdr_dstat->ds_cdrflags;
if ((dp->cdr_dstat->ds_cdrflags & RF_AUDIOMASTER) != 0) {
printf("Turning Audio Master Q. R. on\n");
- if (set_audiomaster_yamaha(scgp, dp, TRUE) < 0)
+ if (set_audiomaster_yamaha(usalp, dp, TRUE) < 0)
return (-1);
if (!debug && lverbose <= 1)
dp->cdr_dstat->ds_cdrflags &= ~RF_PRATIP;
- if (getdisktype_mdvd(scgp, dp) < 0) {
+ if (getdisktype_mdvd(usalp, dp) < 0) {
dp->cdr_dstat->ds_cdrflags = oflags;
return (-1);
}
@@ -3071,14 +3071,14 @@
}
static int
-scsi_sony_write(SCSI *scgp,
+scsi_sony_write(SCSI *usalp,
caddr_t bp /* address of buffer */,
long sectaddr /* disk address (sector) to put */,
long size /* number of bytes to transfer */,
int blocks /* sector count */,
BOOL islast /* last write for track */)
{
- return (write_xg5(scgp, bp, sectaddr, size, blocks));
+ return (write_xg5(usalp, bp, sectaddr, size, blocks));
}
Uchar db2df[] = {
@@ -3227,7 +3227,7 @@
if (lverbose > 1) {
for (i = 0; i < ncue; i++) {
- scg_prbytes("", (Uchar *)&cue[i], 8);
+ usal_prbytes("", (Uchar *)&cue[i], 8);
}
}
if (cuep)
@@ -3257,7 +3257,7 @@
}
static int
-send_cue_mmc(SCSI *scgp, cdr_t *dp, track_t *trackp)
+send_cue_mmc(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
struct mmc_cue *cp;
int ncue;
@@ -3272,14 +3272,14 @@
}
ncue = (*dp->cdr_gen_cue)(trackp, &cp, FALSE);
- scgp->silent++;
- ret = send_cue_sheet(scgp, (caddr_t)cp, ncue*8);
- scgp->silent--;
+ usalp->silent++;
+ ret = send_cue_sheet(usalp, (caddr_t)cp, ncue*8);
+ usalp->silent--;
free(cp);
if (ret < 0) {
errmsgno(EX_BAD, "CUE sheet not accepted. Retrying with minimum pregapsize = 1.\n");
ncue = (*dp->cdr_gen_cue)(trackp, &cp, TRUE);
- ret = send_cue_sheet(scgp, (caddr_t)cp, ncue*8);
+ ret = send_cue_sheet(usalp, (caddr_t)cp, ncue*8);
if (ret < 0) {
errmsgno(EX_BAD,
"CUE sheet still not accepted. Please try to write in RAW (-raw96r) mode.\n");
@@ -3290,13 +3290,13 @@
}
static int
-stats_mmc(SCSI *scgp, cdr_t *dp)
+stats_mmc(SCSI *usalp, cdr_t *dp)
{
Uchar mode[256];
struct ricoh_mode_page_30 *rp;
UInt32_t count;
- if (mmc_isplextor(scgp) && lverbose) {
+ if (mmc_isplextor(usalp) && lverbose) {
int sels;
int maxs;
int lasts;
@@ -3307,8 +3307,8 @@
* features, we may want to check
* dp->cdr_flags & CDR_FORCESPEED
*/
- scgp->silent++;
- if (get_speeds_plextor(scgp, &sels, &maxs, &lasts) >= 0) {
+ usalp->silent++;
+ if (get_speeds_plextor(usalp, &sels, &maxs, &lasts) >= 0) {
printf("Last selected write speed: %dx\n",
sels / 176);
printf("Max media write speed: %dx\n",
@@ -3316,31 +3316,31 @@
printf("Last actual write speed: %dx\n",
lasts / 176);
}
- scgp->silent--;
+ usalp->silent--;
}
if ((dp->cdr_dstat->ds_cdrflags & RF_BURNFREE) == 0)
return (0);
- if (mmc_isplextor(scgp)) {
+ if (mmc_isplextor(usalp)) {
int i = 0;
int ret;
/*
* Read Burn-Proof counter
*/
- scgp->silent++;
- ret = bpc_plextor(scgp, 2, &i);
- scgp->silent--;
+ usalp->silent++;
+ ret = bpc_plextor(usalp, 2, &i);
+ usalp->silent--;
if (ret < 0)
return (-1);
count = i;
/*
* Clear Burn-Proof counter
*/
- bpc_plextor(scgp, 1, NULL);
+ bpc_plextor(usalp, 1, NULL);
} else {
- rp = get_justlink_ricoh(scgp, mode);
+ rp = get_justlink_ricoh(usalp, mode);
if (rp)
count = a_to_u_2_byte(rp->link_counter);
else
@@ -3357,42 +3357,42 @@
}
/*--------------------------------------------------------------------------*/
static BOOL
-mmc_isplextor(SCSI *scgp)
+mmc_isplextor(SCSI *usalp)
{
- if (scgp->inq != NULL &&
- strncmp(scgp->inq->vendor_info, "PLEXTOR", 7) == 0) {
+ if (usalp->inq != NULL &&
+ strncmp(usalp->inq->vendor_info, "PLEXTOR", 7) == 0) {
return (TRUE);
}
return (FALSE);
}
static BOOL
-mmc_isyamaha(SCSI *scgp)
+mmc_isyamaha(SCSI *usalp)
{
- if (scgp->inq != NULL &&
- strncmp(scgp->inq->vendor_info, "YAMAHA", 6) == 0) {
+ if (usalp->inq != NULL &&
+ strncmp(usalp->inq->vendor_info, "YAMAHA", 6) == 0) {
return (TRUE);
}
return (FALSE);
}
static void
-do_varirec_plextor(SCSI *scgp)
+do_varirec_plextor(SCSI *usalp)
{
char *p;
int voff;
p = hasdrvopt(driveropts, "varirec=");
if (p == NULL || curspeed != 4) {
- if (check_varirec_plextor(scgp) >= 0)
- varirec_plextor(scgp, FALSE, 0);
+ if (check_varirec_plextor(usalp) >= 0)
+ varirec_plextor(usalp, FALSE, 0);
} else {
if (*astoi(p, &voff) != '\0')
comerrno(EX_BAD,
"Bad varirec value '%s'.\n", p);
- if (check_varirec_plextor(scgp) < 0)
+ if (check_varirec_plextor(usalp) < 0)
comerrno(EX_BAD, "Drive does not support VariRec.\n");
- varirec_plextor(scgp, TRUE, voff);
+ varirec_plextor(usalp, TRUE, voff);
}
}
@@ -3416,15 +3416,15 @@
};
static int
-do_gigarec_plextor(SCSI *scgp)
+do_gigarec_plextor(SCSI *usalp)
{
char *p;
int val = 0; /* Make silly GCC happy */
p = hasdrvopt(driveropts, "gigarec=");
if (p == NULL) {
- if (check_gigarec_plextor(scgp) >= 0)
- gigarec_plextor(scgp, 0);
+ if (check_gigarec_plextor(usalp) >= 0)
+ gigarec_plextor(usalp, 0);
} else {
struct gr *gp = gr;
@@ -3437,17 +3437,17 @@
if (gp->name == NULL)
comerrno(EX_BAD,
"Bad gigarec value '%s'.\n", p);
- if (check_gigarec_plextor(scgp) < 0)
+ if (check_gigarec_plextor(usalp) < 0)
comerrno(EX_BAD, "Drive does not support GigaRec.\n");
- return (gigarec_plextor(scgp, val));
+ return (gigarec_plextor(usalp, val));
}
return (0);
}
static int
-drivemode_plextor(SCSI *scgp, caddr_t bp, int cnt, int modecode, void *modeval)
+drivemode_plextor(SCSI *usalp, caddr_t bp, int cnt, int modecode, void *modeval)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
@@ -3461,16 +3461,16 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xE9;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.addr[0] = modecode;
if (modeval)
movebytes(modeval, &scmd->cdb.g1_cdb.addr[1], 6);
else
i_to_2_byte(&scmd->cdb.g1_cdb.count[2], cnt);
- scgp->cmdname = "plextor drive mode";
+ usalp->cmdname = "plextor drive mode";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
@@ -3491,9 +3491,9 @@
/* Danach Speed auf 0xFFFF 0xFFFF setzen */
static int
-drivemode2_plextor(SCSI *scgp, caddr_t bp, int cnt, int modecode, void *modeval)
+drivemode2_plextor(SCSI *usalp, caddr_t bp, int cnt, int modecode, void *modeval)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
@@ -3507,72 +3507,72 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xED;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.addr[0] = modecode;
if (modeval)
scmd->cdb.g5_cdb.reladr = *(char *)modeval != 0 ? 1 : 0;
else
i_to_2_byte(&scmd->cdb.g1_cdb.count[1], cnt);
- scgp->cmdname = "plextor drive mode2";
+ usalp->cmdname = "plextor drive mode2";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-check_varirec_plextor(SCSI *scgp)
+check_varirec_plextor(SCSI *usalp)
{
int modecode = 2;
Uchar getmode[8];
fillbytes(getmode, sizeof (getmode), '\0');
- scgp->silent++;
- if (drivemode_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
- scgp->silent--;
+ usalp->silent++;
+ if (drivemode_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
+ usalp->silent--;
return (-1);
}
- scgp->silent--;
+ usalp->silent--;
return (0);
}
static int
-check_gigarec_plextor(SCSI *scgp)
+check_gigarec_plextor(SCSI *usalp)
{
int modecode = 4;
Uchar getmode[8];
fillbytes(getmode, sizeof (getmode), '\0');
- scgp->silent++;
- if (drivemode_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
- scgp->silent--;
+ usalp->silent++;
+ if (drivemode_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
+ usalp->silent--;
return (-1);
}
- scgp->silent--;
+ usalp->silent--;
return (0);
}
static int
-varirec_plextor(SCSI *scgp, BOOL on, int val)
+varirec_plextor(SCSI *usalp, BOOL on, int val)
{
int modecode = 2;
Uchar setmode[8];
Uchar getmode[8];
fillbytes(getmode, sizeof (getmode), '\0');
- scgp->silent++;
- if (drivemode_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
- scgp->silent--;
+ usalp->silent++;
+ if (drivemode_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
+ usalp->silent--;
return (-1);
}
- scgp->silent--;
+ usalp->silent--;
if (lverbose > 1)
- scg_prbytes("Modes", getmode, sizeof (getmode));
+ usal_prbytes("Modes", getmode, sizeof (getmode));
fillbytes(setmode, sizeof (setmode), '\0');
@@ -3591,50 +3591,50 @@
}
}
- if (drivemode_plextor(scgp, NULL, 0, modecode, setmode) < 0)
+ if (drivemode_plextor(usalp, NULL, 0, modecode, setmode) < 0)
return (-1);
fillbytes(getmode, sizeof (getmode), '\0');
- if (drivemode_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0)
+ if (drivemode_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0)
return (-1);
if (lverbose > 1)
- scg_prbytes("Modes", getmode, sizeof (getmode));
+ usal_prbytes("Modes", getmode, sizeof (getmode));
return (0);
}
static int
-gigarec_plextor(SCSI *scgp, int val)
+gigarec_plextor(SCSI *usalp, int val)
{
int modecode = 4;
Uchar setmode[8];
Uchar getmode[8];
fillbytes(getmode, sizeof (getmode), '\0');
- scgp->silent++;
- if (drivemode_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
- scgp->silent--;
+ usalp->silent++;
+ if (drivemode_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
+ usalp->silent--;
return (-1);
}
- scgp->silent--;
+ usalp->silent--;
if (lverbose > 1)
- scg_prbytes("Modes", getmode, sizeof (getmode));
+ usal_prbytes("Modes", getmode, sizeof (getmode));
fillbytes(setmode, sizeof (setmode), '\0');
setmode[1] = val;
- if (drivemode_plextor(scgp, NULL, 0, modecode, setmode) < 0)
+ if (drivemode_plextor(usalp, NULL, 0, modecode, setmode) < 0)
return (-1);
fillbytes(getmode, sizeof (getmode), '\0');
- if (drivemode_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0)
+ if (drivemode_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0)
return (-1);
if (lverbose > 1)
- scg_prbytes("Modes", getmode, sizeof (getmode));
+ usal_prbytes("Modes", getmode, sizeof (getmode));
{
struct gr *gp = gr;
@@ -3669,52 +3669,52 @@
}
static int
-check_ss_hide_plextor(SCSI *scgp)
+check_ss_hide_plextor(SCSI *usalp)
{
int modecode = 1;
Uchar getmode[8];
fillbytes(getmode, sizeof (getmode), '\0');
- scgp->silent++;
- if (drivemode_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
- scgp->silent--;
+ usalp->silent++;
+ if (drivemode_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
+ usalp->silent--;
return (-1);
}
- scgp->silent--;
+ usalp->silent--;
return (getmode[2] & 0x03);
}
static int
-check_speed_rd_plextor(SCSI *scgp)
+check_speed_rd_plextor(SCSI *usalp)
{
int modecode = 0xBB;
Uchar getmode[8];
fillbytes(getmode, sizeof (getmode), '\0');
- scgp->silent++;
- if (drivemode_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
- scgp->silent--;
+ usalp->silent++;
+ if (drivemode_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
+ usalp->silent--;
return (-1);
}
- scgp->silent--;
+ usalp->silent--;
return (getmode[2] & 0x01);
}
static int
-check_powerrec_plextor(SCSI *scgp)
+check_powerrec_plextor(SCSI *usalp)
{
int modecode = 0;
Uchar getmode[8];
fillbytes(getmode, sizeof (getmode), '\0');
- scgp->silent++;
- if (drivemode2_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
- scgp->silent--;
+ usalp->silent++;
+ if (drivemode2_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
+ usalp->silent--;
return (-1);
}
- scgp->silent--;
+ usalp->silent--;
if (getmode[2] & 1)
return (1);
@@ -3723,7 +3723,7 @@
}
static int
-ss_hide_plextor(SCSI *scgp, BOOL do_ss, BOOL do_hide)
+ss_hide_plextor(SCSI *usalp, BOOL do_ss, BOOL do_hide)
{
int modecode = 1;
Uchar setmode[8];
@@ -3732,15 +3732,15 @@
BOOL is_hide;
fillbytes(getmode, sizeof (getmode), '\0');
- scgp->silent++;
- if (drivemode_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
- scgp->silent--;
+ usalp->silent++;
+ if (drivemode_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
+ usalp->silent--;
return (-1);
}
- scgp->silent--;
+ usalp->silent--;
if (lverbose > 1)
- scg_prbytes("Modes", getmode, sizeof (getmode));
+ usal_prbytes("Modes", getmode, sizeof (getmode));
is_ss = (getmode[2] & MB1_SS) != 0;
@@ -3771,21 +3771,21 @@
if (do_hide >= 0 && do_hide != is_hide)
printf("Turning hide CDR %s.\n", do_hide?"on":"off");
- if (drivemode_plextor(scgp, NULL, 0, modecode, setmode) < 0)
+ if (drivemode_plextor(usalp, NULL, 0, modecode, setmode) < 0)
return (-1);
fillbytes(getmode, sizeof (getmode), '\0');
- if (drivemode_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0)
+ if (drivemode_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0)
return (-1);
if (lverbose > 1)
- scg_prbytes("Modes", getmode, sizeof (getmode));
+ usal_prbytes("Modes", getmode, sizeof (getmode));
return (0);
}
static int
-speed_rd_plextor(SCSI *scgp, BOOL do_speedrd)
+speed_rd_plextor(SCSI *usalp, BOOL do_speedrd)
{
int modecode = 0xBB;
Uchar setmode[8];
@@ -3793,15 +3793,15 @@
BOOL is_speedrd;
fillbytes(getmode, sizeof (getmode), '\0');
- scgp->silent++;
- if (drivemode_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
- scgp->silent--;
+ usalp->silent++;
+ if (drivemode_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
+ usalp->silent--;
return (-1);
}
- scgp->silent--;
+ usalp->silent--;
if (lverbose > 1)
- scg_prbytes("Modes", getmode, sizeof (getmode));
+ usal_prbytes("Modes", getmode, sizeof (getmode));
is_speedrd = (getmode[2] & MBbb_SPEAD_READ) != 0;
@@ -3821,27 +3821,27 @@
if (do_speedrd >= 0 && do_speedrd != is_speedrd)
printf("Turning Speed-Read %s.\n", do_speedrd?"on":"off");
- if (drivemode_plextor(scgp, NULL, 0, modecode, setmode) < 0)
+ if (drivemode_plextor(usalp, NULL, 0, modecode, setmode) < 0)
return (-1);
fillbytes(getmode, sizeof (getmode), '\0');
- if (drivemode_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0)
+ if (drivemode_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0)
return (-1);
if (lverbose > 1)
- scg_prbytes("Modes", getmode, sizeof (getmode));
+ usal_prbytes("Modes", getmode, sizeof (getmode));
/*
* Set current read speed to new max value.
*/
if (do_speedrd >= 0 && do_speedrd != is_speedrd)
- scsi_set_speed(scgp, 0xFFFF, -1, ROTCTL_CAV);
+ scsi_set_speed(usalp, 0xFFFF, -1, ROTCTL_CAV);
return (0);
}
static int
-powerrec_plextor(SCSI *scgp, BOOL do_powerrec)
+powerrec_plextor(SCSI *usalp, BOOL do_powerrec)
{
int modecode = 0;
Uchar setmode[8];
@@ -3850,15 +3850,15 @@
int speed;
fillbytes(getmode, sizeof (getmode), '\0');
- scgp->silent++;
- if (drivemode2_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
- scgp->silent--;
+ usalp->silent++;
+ if (drivemode2_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0) {
+ usalp->silent--;
return (-1);
}
- scgp->silent--;
+ usalp->silent--;
if (lverbose > 1)
- scg_prbytes("Modes", getmode, sizeof (getmode));
+ usal_prbytes("Modes", getmode, sizeof (getmode));
is_powerrec = (getmode[2] & 1) != 0;
@@ -3882,23 +3882,23 @@
if (do_powerrec >= 0 && do_powerrec != is_powerrec)
printf("Turning Power-Rec %s.\n", do_powerrec?"on":"off");
- if (drivemode2_plextor(scgp, NULL, 0, modecode, setmode) < 0)
+ if (drivemode2_plextor(usalp, NULL, 0, modecode, setmode) < 0)
return (-1);
fillbytes(getmode, sizeof (getmode), '\0');
- if (drivemode2_plextor(scgp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0)
+ if (drivemode2_plextor(usalp, (caddr_t)getmode, sizeof (getmode), modecode, NULL) < 0)
return (-1);
if (lverbose > 1)
- scg_prbytes("Modes", getmode, sizeof (getmode));
+ usal_prbytes("Modes", getmode, sizeof (getmode));
return (0);
}
static int
-get_speeds_plextor(SCSI *scgp, int *selp, int *maxp, int *lastp)
+get_speeds_plextor(SCSI *usalp, int *selp, int *maxp, int *lastp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
char buf[10];
int i;
@@ -3911,13 +3911,13 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xEB;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
i_to_2_byte(&scmd->cdb.g1_cdb.count[1], sizeof (buf));
- scgp->cmdname = "plextor get speedlist";
+ usalp->cmdname = "plextor get speedlist";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
i = a_to_u_2_byte(&buf[4]);
@@ -3936,9 +3936,9 @@
}
static int
-bpc_plextor(SCSI *scgp, int mode, int *bpp)
+bpc_plextor(SCSI *usalp, int mode, int *bpp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
char buf[4];
int i;
@@ -3951,19 +3951,19 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xF5;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g5_cdb.addr[1] = 0x08;
scmd->cdb.g5_cdb.addr[2] = mode;
i_to_2_byte(&scmd->cdb.g1_cdb.count[1], sizeof (buf));
- scgp->cmdname = "plextor read bpc";
+ usalp->cmdname = "plextor read bpc";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
- if (scg_getresid(scgp) > 2)
+ if (usal_getresid(usalp) > 2)
return (0);
i = a_to_u_2_byte(buf);
@@ -3974,7 +3974,7 @@
}
static int
-set_audiomaster_yamaha(SCSI *scgp, cdr_t *dp, BOOL keep_mode)
+set_audiomaster_yamaha(SCSI *usalp, cdr_t *dp, BOOL keep_mode)
{
Uchar mode[0x100];
int len;
@@ -3987,18 +3987,18 @@
/*
* Do not reset mp->test_write (-dummy) here.
*/
- deflt_writemodes_mmc(scgp, FALSE);
+ deflt_writemodes_mmc(usalp, FALSE);
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- scgp->silent++;
- if (!get_mode_params(scgp, 0x05, "CD write parameter",
+ usalp->silent++;
+ if (!get_mode_params(usalp, 0x05, "CD write parameter",
mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
- scgp->silent--;
+ usalp->silent--;
return (-1);
}
if (len == 0) {
- scgp->silent--;
+ usalp->silent--;
return (-1);
}
@@ -4006,7 +4006,7 @@
(mode + sizeof (struct scsi_mode_header) +
((struct scsi_mode_header *)mode)->blockdesc_len);
#ifdef DEBUG
- scg_prbytes("CD write parameter:", (Uchar *)mode, len);
+ usal_prbytes("CD write parameter:", (Uchar *)mode, len);
#endif
/*
@@ -4019,32 +4019,32 @@
mp->track_mode = 0;
mp->dbtype = DB_RAW;
- if (!set_mode_params(scgp, "CD write parameter", mode, len, 0, -1))
+ if (!set_mode_params(usalp, "CD write parameter", mode, len, 0, -1))
ret = -1;
/*
* Do not reset mp->test_write (-dummy) here.
*/
if (!keep_mode || ret < 0)
- deflt_writemodes_mmc(scgp, FALSE);
- scgp->silent--;
+ deflt_writemodes_mmc(usalp, FALSE);
+ usalp->silent--;
return (ret);
}
struct
-ricoh_mode_page_30 *get_justlink_ricoh(SCSI *scgp, Uchar *mode)
+ricoh_mode_page_30 *get_justlink_ricoh(SCSI *usalp, Uchar *mode)
{
Uchar modec[0x100];
int len;
struct ricoh_mode_page_30 *mp;
- scgp->silent++;
- if (!get_mode_params(scgp, 0x30, "Ricoh Vendor Page", mode, modec, NULL, NULL, &len)) {
- scgp->silent--;
+ usalp->silent++;
+ if (!get_mode_params(usalp, 0x30, "Ricoh Vendor Page", mode, modec, NULL, NULL, &len)) {
+ usalp->silent--;
return ((struct ricoh_mode_page_30 *)0);
}
- scgp->silent--;
+ usalp->silent--;
/*
* SCSI mode header + 6 bytes mode page 30.
@@ -4055,8 +4055,8 @@
if (xdebug) {
fprintf(stderr, "Mode len: %d\n", len);
- scg_prbytes("Mode Sense Data ", mode, len);
- scg_prbytes("Mode Sence CData", modec, len);
+ usal_prbytes("Mode Sense Data ", mode, len);
+ usal_prbytes("Mode Sence CData", modec, len);
}
mp = (struct ricoh_mode_page_30 *)
@@ -4077,16 +4077,16 @@
}
static int
-force_speed_yamaha(SCSI *scgp, int readspeed, int writespeed)
+force_speed_yamaha(SCSI *usalp, int readspeed, int writespeed)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xBB;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
if (readspeed < 0)
i_to_2_byte(&scmd->cdb.g5_cdb.addr[0], 0xFFFF);
@@ -4099,15 +4099,15 @@
scmd->cdb.cmd_cdb[11] = 0x80;
- scgp->cmdname = "yamaha force cd speed";
+ usalp->cmdname = "yamaha force cd speed";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static BOOL
-get_tattoo_yamaha(SCSI *scgp, BOOL print, Int32_t *irp, Int32_t *orp)
+get_tattoo_yamaha(SCSI *usalp, BOOL print, Int32_t *irp, Int32_t *orp)
{
Uchar mode[0x100];
int len;
@@ -4115,12 +4115,12 @@
UInt32_t oval;
Uchar *mp;
- scgp->silent++;
- if (!get_mode_params(scgp, 0x31, "Yamaha Tattoo Page", mode, NULL, NULL, NULL, &len)) {
- scgp->silent--;
+ usalp->silent++;
+ if (!get_mode_params(usalp, 0x31, "Yamaha Tattoo Page", mode, NULL, NULL, NULL, &len)) {
+ usalp->silent--;
return (FALSE);
}
- scgp->silent--;
+ usalp->silent--;
/*
* SCSI mode header + 16 bytes mode page 31.
@@ -4159,21 +4159,21 @@
}
static int
-do_tattoo_yamaha(SCSI *scgp, FILE *f)
+do_tattoo_yamaha(SCSI *usalp, FILE *f)
{
Int32_t ival = 0;
Int32_t oval = 0;
Int32_t lines;
off_t fsize;
- char *buf = scgp->bufptr;
- long bufsize = scgp->maxbuf;
+ char *buf = usalp->bufptr;
+ long bufsize = usalp->maxbuf;
long nsecs;
long amt;
nsecs = bufsize / 2048;
bufsize = nsecs * 2048;
- if (!get_tattoo_yamaha(scgp, FALSE, &ival, &oval)) {
+ if (!get_tattoo_yamaha(usalp, FALSE, &ival, &oval)) {
errmsgno(EX_BAD, "Cannot get DiskT at 2 info.\n");
return (-1);
}
@@ -4200,7 +4200,7 @@
return (-1);
}
- if (yamaha_write_buffer(scgp, 1, 0, ival, amt/2048, buf, amt) < 0) {
+ if (yamaha_write_buffer(usalp, 1, 0, ival, amt/2048, buf, amt) < 0) {
errmsgno(EX_BAD, "DiskT at 2 1st write error.\n");
return (-1);
}
@@ -4215,19 +4215,19 @@
}
amt = (amt+2047) / 2048 * 2048;
fsize -= amt;
- if (yamaha_write_buffer(scgp, 1, 0, 0, amt/2048, buf, amt) < 0) {
+ if (yamaha_write_buffer(usalp, 1, 0, 0, amt/2048, buf, amt) < 0) {
errmsgno(EX_BAD, "DiskT at 2 write error.\n");
return (-1);
}
}
- if (yamaha_write_buffer(scgp, 1, 0, oval, 0, buf, 0) < 0) {
+ if (yamaha_write_buffer(usalp, 1, 0, oval, 0, buf, 0) < 0) {
errmsgno(EX_BAD, "DiskT at 2 final error.\n");
return (-1);
}
- wait_unit_ready(scgp, 1000); /* Wait for DiskT at 2 */
- waitfix_mmc(scgp, 1000); /* Wait for DiskT at 2 */
+ wait_unit_ready(usalp, 1000); /* Wait for DiskT at 2 */
+ waitfix_mmc(usalp, 1000); /* Wait for DiskT at 2 */
return (0);
}
@@ -4237,10 +4237,10 @@
* Parameter Length 'parlen' parameter.
*/
static int
-yamaha_write_buffer(SCSI *scgp, int mode, int bufferid, long offset,
+yamaha_write_buffer(SCSI *usalp, int mode, int bufferid, long offset,
long parlen, void *buffer, long buflen)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
Uchar *CDB;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
@@ -4257,21 +4257,21 @@
i_to_3_byte(&CDB[3], offset);
i_to_3_byte(&CDB[6], parlen);
- scgp->cmdname = "write_buffer";
+ usalp->cmdname = "write_buffer";
- if (scg_cmd(scgp) >= 0)
+ if (usal_cmd(usalp) >= 0)
return (1);
return (0);
}
static int
-dvd_dual_layer_split(SCSI *scgp, cdr_t *dp, long tsize)
+dvd_dual_layer_split(SCSI *usalp, cdr_t *dp, long tsize)
{
unsigned char xb[12];
long l0_size;
/* Get the Layer 0 defined data zone*/
- if (read_dvd_structure(scgp, (caddr_t)xb, 12, 0, 0, 0x20) >= 0) {
+ if (read_dvd_structure(usalp, (caddr_t)xb, 12, 0, 0, 0x20) >= 0) {
if ((xb[1] | xb[0] << 8) < 13) {
fprintf(stderr, "dvd_dual_layer_split: read_dvd_structure returns invalid data\n");
return 1;
@@ -4296,7 +4296,7 @@
xb[9] = l0_size >> 16;
xb[10] = l0_size >> 8;
xb[11] = l0_size;
- if (send_dvd_structure(scgp, (caddr_t)xb, 12, 0, 0x20)) {
+ if (send_dvd_structure(usalp, (caddr_t)xb, 12, 0, 0x20)) {
fprintf(stderr, "dvd_dual_layer_split: send_dvd_structure failed, could not set middle zone location.\n");
return 0;
}
Modified: cdrkit/trunk/wodim/drv_philips.c
===================================================================
--- cdrkit/trunk/wodim/drv_philips.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/drv_philips.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -44,50 +44,50 @@
#include <intcvt.h>
#include <schily.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
-#include <scg/scgcmd.h>
-#include <scg/scsidefs.h> /* XXX Only for DEV_RICOH_RO_1060C */
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsidefs.h> /* XXX Only for DEV_RICOH_RO_1060C */
#include "wodim.h"
extern int debug;
extern int lverbose;
-static int load_unload_philips(SCSI *scgp, int);
-static int philips_load(SCSI *scgp, cdr_t *dp);
-static int philips_unload(SCSI *scgp, cdr_t *dp);
-static int philips_dumbload(SCSI *scgp, cdr_t *dp);
-static int philips_dumbunload(SCSI *scgp, cdr_t *dp);
+static int load_unload_philips(SCSI *usalp, int);
+static int philips_load(SCSI *usalp, cdr_t *dp);
+static int philips_unload(SCSI *usalp, cdr_t *dp);
+static int philips_dumbload(SCSI *usalp, cdr_t *dp);
+static int philips_dumbunload(SCSI *usalp, cdr_t *dp);
static int plasmon_buf(SCSI *, long *, long *);
-static int recover_philips(SCSI *scgp, cdr_t *dp, int);
-static int speed_select_yamaha(SCSI *scgp, cdr_t *dp, int *speedp);
-static int speed_select_philips(SCSI *scgp, cdr_t *dp, int *speedp);
-static int speed_select_oldphilips(SCSI *scgp, cdr_t *dp, int *speedp);
-static int speed_select_dumbphilips(SCSI *scgp, cdr_t *dp, int *speedp);
-static int speed_select_pioneer(SCSI *scgp, cdr_t *dp, int *speedp);
-static int philips_init(SCSI *scgp, cdr_t *dp);
-static int philips_getdisktype(SCSI *scgp, cdr_t *dp);
-static BOOL capacity_philips(SCSI *scgp, long *lp);
-static int first_writable_addr_philips(SCSI *scgp, long *, int, int, int,
+static int recover_philips(SCSI *usalp, cdr_t *dp, int);
+static int speed_select_yamaha(SCSI *usalp, cdr_t *dp, int *speedp);
+static int speed_select_philips(SCSI *usalp, cdr_t *dp, int *speedp);
+static int speed_select_oldphilips(SCSI *usalp, cdr_t *dp, int *speedp);
+static int speed_select_dumbphilips(SCSI *usalp, cdr_t *dp, int *speedp);
+static int speed_select_pioneer(SCSI *usalp, cdr_t *dp, int *speedp);
+static int philips_init(SCSI *usalp, cdr_t *dp);
+static int philips_getdisktype(SCSI *usalp, cdr_t *dp);
+static BOOL capacity_philips(SCSI *usalp, long *lp);
+static int first_writable_addr_philips(SCSI *usalp, long *, int, int, int,
int);
-static int next_wr_addr_philips(SCSI *scgp, track_t *trackp, long *ap);
-static int reserve_track_philips(SCSI *scgp, unsigned long);
-static int scsi_cdr_write_philips(SCSI *scgp, caddr_t bp, long sectaddr,
+static int next_wr_addr_philips(SCSI *usalp, track_t *trackp, long *ap);
+static int reserve_track_philips(SCSI *usalp, unsigned long);
+static int scsi_cdr_write_philips(SCSI *usalp, caddr_t bp, long sectaddr,
long size, int blocks, BOOL islast);
-static int write_track_info_philips(SCSI *scgp, int);
-static int write_track_philips(SCSI *scgp, long, int);
-static int open_track_philips(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int open_track_plasmon(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int open_track_oldphilips(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int open_track_yamaha(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int close_track_philips(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int fixation_philips(SCSI *scgp, cdr_t *dp, track_t *trackp);
+static int write_track_info_philips(SCSI *usalp, int);
+static int write_track_philips(SCSI *usalp, long, int);
+static int open_track_philips(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int open_track_plasmon(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int open_track_oldphilips(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int open_track_yamaha(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int close_track_philips(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int fixation_philips(SCSI *usalp, cdr_t *dp, track_t *trackp);
-static int philips_attach(SCSI *scgp, cdr_t *);
-static int plasmon_attach(SCSI *scgp, cdr_t *);
-static int ricoh_attach(SCSI *scgp, cdr_t *);
-static int philips_getlilo(SCSI *scgp, long *lilenp, long *lolenp);
+static int philips_attach(SCSI *usalp, cdr_t *);
+static int plasmon_attach(SCSI *usalp, cdr_t *);
+static int ricoh_attach(SCSI *usalp, cdr_t *);
+static int philips_getlilo(SCSI *usalp, long *lilenp, long *lolenp);
struct cdd_52x_mode_page_21 { /* write track information */
@@ -597,65 +597,65 @@
};
-static int load_unload_philips(SCSI *scgp, int load)
+static int load_unload_philips(SCSI *usalp, int load)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xE7;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.count[1] = !load;
- scgp->cmdname = "philips medium load/unload";
+ usalp->cmdname = "philips medium load/unload";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-philips_load(SCSI *scgp, cdr_t *dp)
+philips_load(SCSI *usalp, cdr_t *dp)
{
- return (load_unload_philips(scgp, 1));
+ return (load_unload_philips(usalp, 1));
}
static int
-philips_unload(SCSI *scgp, cdr_t *dp)
+philips_unload(SCSI *usalp, cdr_t *dp)
{
- return (load_unload_philips(scgp, 0));
+ return (load_unload_philips(usalp, 0));
}
static int
-philips_dumbload(SCSI *scgp, cdr_t *dp)
+philips_dumbload(SCSI *usalp, cdr_t *dp)
{
int ret;
- scgp->silent++;
- ret = load_unload_philips(scgp, 1);
- scgp->silent--;
+ usalp->silent++;
+ ret = load_unload_philips(usalp, 1);
+ usalp->silent--;
if (ret < 0)
- return (scsi_load(scgp, dp));
+ return (scsi_load(usalp, dp));
return (0);
}
static int
-philips_dumbunload(SCSI *scgp, cdr_t *dp)
+philips_dumbunload(SCSI *usalp, cdr_t *dp)
{
int ret;
- scgp->silent++;
- ret = load_unload_philips(scgp, 0);
- scgp->silent--;
+ usalp->silent++;
+ ret = load_unload_philips(usalp, 0);
+ usalp->silent--;
if (ret < 0)
- return (scsi_unload(scgp, dp));
+ return (scsi_unload(usalp, dp));
return (0);
}
static int
-plasmon_buf(SCSI *scgp,
+plasmon_buf(SCSI *usalp,
long *sp /* Size pointer */,
long *fp /* Free space pointer */)
{
@@ -678,26 +678,26 @@
}
static int
-recover_philips(SCSI *scgp, cdr_t *dp, int track)
+recover_philips(SCSI *usalp, cdr_t *dp, int track)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xEC;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
- scgp->cmdname = "philips recover";
+ usalp->cmdname = "philips recover";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-speed_select_yamaha(SCSI *scgp, cdr_t *dp, int *speedp)
+speed_select_yamaha(SCSI *usalp, cdr_t *dp, int *speedp)
{
struct scsi_mode_page_header *mp;
char mode[256];
@@ -714,7 +714,7 @@
} else {
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- if (!get_mode_params(scgp, page, "Speed/Dummy information",
+ if (!get_mode_params(usalp, page, "Speed/Dummy information",
(Uchar *)mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
return (-1);
}
@@ -740,11 +740,11 @@
md.pagex.page31.speed = speed;
md.pagex.page31.dummy = dummy?1:0;
- return (mode_select(scgp, (Uchar *)&md, count, 0, scgp->inq->data_format >= 2));
+ return (mode_select(usalp, (Uchar *)&md, count, 0, usalp->inq->data_format >= 2));
}
static int
-speed_select_philips(SCSI *scgp, cdr_t *dp, int *speedp)
+speed_select_philips(SCSI *usalp, cdr_t *dp, int *speedp)
{
struct scsi_mode_page_header *mp;
char mode[256];
@@ -761,7 +761,7 @@
} else {
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- if (!get_mode_params(scgp, page, "Speed/Dummy information",
+ if (!get_mode_params(usalp, page, "Speed/Dummy information",
(Uchar *)mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
return (-1);
}
@@ -786,22 +786,22 @@
md.pagex.page23.speed = speed;
md.pagex.page23.dummy = dummy?1:0;
- return (mode_select(scgp, (Uchar *)&md, count, 0, scgp->inq->data_format >= 2));
+ return (mode_select(usalp, (Uchar *)&md, count, 0, usalp->inq->data_format >= 2));
}
static int
-speed_select_pioneer(SCSI *scgp, cdr_t *dp, int *speedp)
+speed_select_pioneer(SCSI *usalp, cdr_t *dp, int *speedp)
{
if (speedp != 0 && *speedp < 2) {
*speedp = 2;
if (lverbose)
printf("WARNING: setting to minimum speed (2).\n");
}
- return (speed_select_philips(scgp, dp, speedp));
+ return (speed_select_philips(usalp, dp, speedp));
}
static int
-speed_select_oldphilips(SCSI *scgp, cdr_t *dp, int *speedp)
+speed_select_oldphilips(SCSI *usalp, cdr_t *dp, int *speedp)
{
BOOL dummy = (dp->cdr_cmdflags & F_DUMMY) != 0;
@@ -815,24 +815,24 @@
}
static int
-speed_select_dumbphilips(SCSI *scgp, cdr_t *dp, int *speedp)
+speed_select_dumbphilips(SCSI *usalp, cdr_t *dp, int *speedp)
{
- if (speed_select_philips(scgp, dp, speedp) < 0)
- return (speed_select_oldphilips(scgp, dp, speedp));
+ if (speed_select_philips(usalp, dp, speedp) < 0)
+ return (speed_select_oldphilips(usalp, dp, speedp));
return (0);
}
static int
-philips_init(SCSI *scgp, cdr_t *dp)
+philips_init(SCSI *usalp, cdr_t *dp)
{
- return ((*dp->cdr_set_speed_dummy)(scgp, dp, NULL));
+ return ((*dp->cdr_set_speed_dummy)(usalp, dp, NULL));
}
#define IS(what, flag) printf(" Is %s%s\n", flag?"":"not ", what);
static int
-philips_getdisktype(SCSI *scgp, cdr_t *dp)
+philips_getdisktype(SCSI *usalp, cdr_t *dp)
{
dstat_t *dsp = dp->cdr_dstat;
char sbuf[16];
@@ -842,32 +842,32 @@
msf_t msf;
int audio = -1;
- scgp->silent++;
- dummy = (*dp->cdr_next_wr_address)(scgp, (track_t *)0, &lilen);
- scgp->silent--;
+ usalp->silent++;
+ dummy = (*dp->cdr_next_wr_address)(usalp, (track_t *)0, &lilen);
+ usalp->silent--;
/*
* Check for "Command sequence error" first.
*/
if ((dsp->ds_cdrflags & RF_WRITE) != 0 &&
dummy < 0 &&
- (scg_sense_key(scgp) != SC_ILLEGAL_REQUEST ||
- scg_sense_code(scgp) != 0x2C)) {
- reload_media(scgp, dp);
+ (usal_sense_key(usalp) != SC_ILLEGAL_REQUEST ||
+ usal_sense_code(usalp) != 0x2C)) {
+ reload_media(usalp, dp);
}
- scgp->silent++;
- if (read_subchannel(scgp, sbuf, 0, 12, 0, 1, 0xf0) >= 0) {
+ usalp->silent++;
+ if (read_subchannel(usalp, sbuf, 0, 12, 0, 1, 0xf0) >= 0) {
if (sbuf[2] == 0 && sbuf[3] == 8)
audio = (sbuf[7] & 0x40) != 0;
}
- scgp->silent--;
+ usalp->silent--;
if ((dp->cdr_dstat->ds_cdrflags & RF_PRATIP) != 0 &&
dummy >= 0 && lilen == 0) {
- scgp->silent++;
- dummy = philips_getlilo(scgp, &lilen, &lolen);
- scgp->silent--;
+ usalp->silent++;
+ dummy = philips_getlilo(usalp, &lilen, &lolen);
+ usalp->silent--;
if (dummy >= 0) {
/* printf("lead-in len: %d lead-out len: %d\n", lilen, lolen);*/
@@ -881,7 +881,7 @@
printf(" ATIP start of lead in: %ld (%02d:%02d/%02d)\n",
-150 - lilen, msf.msf_min, msf.msf_sec, msf.msf_frame);
- if (capacity_philips(scgp, &lolen)) {
+ if (capacity_philips(usalp, &lolen)) {
lba_to_msf(lolen, &msf);
printf(
" ATIP start of lead out: %ld (%02d:%02d/%02d)\n",
@@ -894,46 +894,46 @@
}
}
- if (capacity_philips(scgp, &lolen)) {
+ if (capacity_philips(usalp, &lolen)) {
dsp->ds_maxblocks = lolen;
dsp->ds_maxrblocks = disk_rcap(&msf, dsp->ds_maxblocks,
FALSE, /* Always not erasable */
audio > 0); /* Audio from read subcode */
}
- scgp->silent++;
- /*read_subchannel(scgp, bp, track, cnt, msf, subq, fmt); */
+ usalp->silent++;
+ /*read_subchannel(usalp, bp, track, cnt, msf, subq, fmt); */
- if (read_subchannel(scgp, sbuf, 0, 14, 0, 0, 0xf1) >= 0)
- scg_prbytes("Disk bar code:", (Uchar *)sbuf, 14 - scg_getresid(scgp));
- scgp->silent--;
+ if (read_subchannel(usalp, sbuf, 0, 14, 0, 0, 0xf1) >= 0)
+ usal_prbytes("Disk bar code:", (Uchar *)sbuf, 14 - usal_getresid(usalp));
+ usalp->silent--;
- return (drive_getdisktype(scgp, dp));
+ return (drive_getdisktype(usalp, dp));
}
static BOOL
-capacity_philips(SCSI *scgp, long *lp)
+capacity_philips(SCSI *usalp, long *lp)
{
long l = 0L;
BOOL succeed = TRUE;
- scgp->silent++;
- if (read_B0(scgp, FALSE, NULL, &l) >= 0) {
+ usalp->silent++;
+ if (read_B0(usalp, FALSE, NULL, &l) >= 0) {
if (debug)
printf("lead out B0: %ld\n", l);
*lp = l;
- } else if (read_trackinfo(scgp, 0xAA, &l, NULL, NULL, NULL, NULL) >= 0) {
+ } else if (read_trackinfo(usalp, 0xAA, &l, NULL, NULL, NULL, NULL) >= 0) {
if (debug)
printf("lead out AA: %ld\n", l);
*lp = l;
- } if (read_capacity(scgp) >= 0) {
- l = scgp->cap->c_baddr + 1;
+ } if (read_capacity(usalp) >= 0) {
+ l = usalp->cap->c_baddr + 1;
if (debug)
printf("lead out capacity: %ld\n", l);
} else {
succeed = FALSE;
}
*lp = l;
- scgp->silent--;
+ usalp->silent--;
return (succeed);
}
@@ -944,11 +944,11 @@
};
static int
-first_writable_addr_philips(SCSI *scgp, long *ap, int track, int isaudio,
+first_writable_addr_philips(SCSI *usalp, long *ap, int track, int isaudio,
int preemp, int npa)
{
struct fwa fwa;
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)&fwa, sizeof (fwa), '\0');
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
@@ -958,16 +958,16 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xE2;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.addr[0] = track;
scmd->cdb.g1_cdb.addr[1] = isaudio ? (preemp ? 5 : 4) : 1;
scmd->cdb.g1_cdb.count[0] = npa?1:0;
scmd->cdb.g1_cdb.count[1] = sizeof (fwa);
- scgp->cmdname = "first writeable address philips";
+ usalp->cmdname = "first writeable address philips";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
if (ap)
@@ -976,48 +976,48 @@
}
static int
-next_wr_addr_philips(SCSI *scgp, track_t *trackp, long *ap)
+next_wr_addr_philips(SCSI *usalp, track_t *trackp, long *ap)
{
-/* if (first_writable_addr_philips(scgp, ap, 0, 0, 0, 1) < 0)*/
- if (first_writable_addr_philips(scgp, ap, 0, 0, 0, 0) < 0)
+/* if (first_writable_addr_philips(usalp, ap, 0, 0, 0, 1) < 0)*/
+ if (first_writable_addr_philips(usalp, ap, 0, 0, 0, 0) < 0)
return (-1);
return (0);
}
static int
-reserve_track_philips(SCSI *scgp, unsigned long len)
+reserve_track_philips(SCSI *usalp, unsigned long len)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xE4;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
i_to_4_byte(&scmd->cdb.g1_cdb.addr[3], len);
- scgp->cmdname = "philips reserve_track";
+ usalp->cmdname = "philips reserve_track";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-scsi_cdr_write_philips(SCSI *scgp,
+scsi_cdr_write_philips(SCSI *usalp,
caddr_t bp /* address of buffer */,
long sectaddr /* disk address (sector) to put */,
long size /* number of bytes to transfer */,
int blocks /* sector count */,
BOOL islast /* last write for track */)
{
- return (write_xg0(scgp, bp, 0, size, blocks));
+ return (write_xg0(usalp, bp, 0, size, blocks));
}
static int
-write_track_info_philips(SCSI *scgp, int sectype)
+write_track_info_philips(SCSI *usalp, int sectype)
{
struct cdd_52x_mode_data md;
int count = sizeof (struct scsi_mode_header) +
@@ -1030,15 +1030,15 @@
md.pagex.page21.sectype = sectype & ST_MASK;
md.pagex.page21.track = 0; /* 0 : create new track */
- return (mode_select(scgp, (Uchar *)&md, count, 0, scgp->inq->data_format >= 2));
+ return (mode_select(usalp, (Uchar *)&md, count, 0, usalp->inq->data_format >= 2));
}
static int
-write_track_philips(SCSI *scgp,
+write_track_philips(SCSI *usalp,
long track /* track number 0 == new track */,
int sectype)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA|SCG_CMD_RETRY;
@@ -1046,74 +1046,74 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xE6;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdbaddr(&scmd->cdb.g1_cdb, track);
scmd->cdb.g1_cdb.res6 = sectype & ST_MASK;
- scgp->cmdname = "philips write_track";
+ usalp->cmdname = "philips write_track";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-open_track_philips(SCSI *scgp, cdr_t *dp, track_t *trackp)
+open_track_philips(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
- if (select_secsize(scgp, trackp->secsize) < 0)
+ if (select_secsize(usalp, trackp->secsize) < 0)
return (-1);
- if (write_track_info_philips(scgp, trackp->sectype) < 0)
+ if (write_track_info_philips(usalp, trackp->sectype) < 0)
return (-1);
- if (write_track_philips(scgp, 0, trackp->sectype) < 0)
+ if (write_track_philips(usalp, 0, trackp->sectype) < 0)
return (-1);
return (0);
}
static int
-open_track_plasmon(SCSI *scgp, cdr_t *dp, track_t *trackp)
+open_track_plasmon(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
- if (select_secsize(scgp, trackp->secsize) < 0)
+ if (select_secsize(usalp, trackp->secsize) < 0)
return (-1);
- if (write_track_info_philips(scgp, trackp->sectype) < 0)
+ if (write_track_info_philips(usalp, trackp->sectype) < 0)
return (-1);
return (0);
}
static int
-open_track_oldphilips(SCSI *scgp, cdr_t *dp, track_t *trackp)
+open_track_oldphilips(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
- if (write_track_philips(scgp, 0, trackp->sectype) < 0)
+ if (write_track_philips(usalp, 0, trackp->sectype) < 0)
return (-1);
return (0);
}
static int
-open_track_yamaha(SCSI *scgp, cdr_t *dp, track_t *trackp)
+open_track_yamaha(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
- if (select_secsize(scgp, trackp->secsize) < 0)
+ if (select_secsize(usalp, trackp->secsize) < 0)
return (-1);
- if (write_track_philips(scgp, 0, trackp->sectype) < 0)
+ if (write_track_philips(usalp, 0, trackp->sectype) < 0)
return (-1);
return (0);
}
static int
-close_track_philips(SCSI *scgp, cdr_t *dp, track_t *trackp)
+close_track_philips(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
- return (scsi_flush_cache(scgp, FALSE));
+ return (scsi_flush_cache(usalp, FALSE));
}
-static int fixation_philips(SCSI *scgp, cdr_t *dp, track_t *trackp)
+static int fixation_philips(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
@@ -1121,14 +1121,14 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->timeout = 8 * 60; /* Needs up to 4 minutes */
scmd->cdb.g1_cdb.cmd = 0xE9;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.count[1] =
((track_base(trackp)->tracktype & TOCF_MULTI) ? 8 : 0) |
(track_base(trackp)->tracktype & TOC_MASK);
- scgp->cmdname = "philips fixation";
+ usalp->cmdname = "philips fixation";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
@@ -1287,38 +1287,38 @@
};
static int
-philips_attach(SCSI *scgp, cdr_t *dp)
+philips_attach(SCSI *usalp, cdr_t *dp)
{
- scg_setnonstderrs(scgp, sd_cdd_521_error_str);
+ usal_setnonstderrs(usalp, sd_cdd_521_error_str);
return (0);
}
static int
-plasmon_attach(SCSI *scgp, cdr_t *dp)
+plasmon_attach(SCSI *usalp, cdr_t *dp)
{
- scgp->inq->data_format = 1; /* Correct the ly */
+ usalp->inq->data_format = 1; /* Correct the ly */
- scg_setnonstderrs(scgp, sd_cdd_521_error_str);
+ usal_setnonstderrs(usalp, sd_cdd_521_error_str);
return (0);
}
static int
-ricoh_attach(SCSI *scgp, cdr_t *dp)
+ricoh_attach(SCSI *usalp, cdr_t *dp)
{
if (dp == &cdr_ricoh_ro1060) {
errmsgno(EX_BAD, "No support for Ricoh RO-1060C\n");
return (-1);
}
- scg_setnonstderrs(scgp, sd_ro1420_error_str);
+ usal_setnonstderrs(usalp, sd_ro1420_error_str);
return (0);
}
static int
-philips_getlilo(SCSI *scgp, long *lilenp, long *lolenp)
+philips_getlilo(SCSI *usalp, long *lilenp, long *lolenp)
{
char buf[4];
long li, lo;
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = buf;
@@ -1327,16 +1327,16 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xEE; /* Read session info */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdblen(&scmd->cdb.g1_cdb, sizeof (buf));
- scgp->cmdname = "philips read session info";
+ usalp->cmdname = "philips read session info";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
- if (scgp->verbose)
- scg_prbytes("Session info data: ", (Uchar *)buf, sizeof (buf) - scg_getresid(scgp));
+ if (usalp->verbose)
+ usal_prbytes("Session info data: ", (Uchar *)buf, sizeof (buf) - usal_getresid(usalp));
li = a_to_u_2_byte(buf);
lo = a_to_u_2_byte(&buf[2]);
Modified: cdrkit/trunk/wodim/drv_simul.c
===================================================================
--- cdrkit/trunk/wodim/drv_simul.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/drv_simul.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -51,10 +51,10 @@
#include <btorder.h>
#include <schily.h>
-/*#include <scgio.h>*/
-#include <scg/scsidefs.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+/*#include <usalio.h>*/
+#include <usal/scsidefs.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include <libport.h>
@@ -64,27 +64,27 @@
extern int verbose;
extern int lverbose;
-static int simul_load(SCSI *scgp, cdr_t *);
-static int simul_unload(SCSI *scgp, cdr_t *);
-static cdr_t *identify_simul(SCSI *scgp, cdr_t *, struct scsi_inquiry *);
-static int init_simul(SCSI *scgp, cdr_t *dp);
-static int getdisktype_simul(SCSI *scgp, cdr_t *dp);
-static int speed_select_simul(SCSI *scgp, cdr_t *dp, int *speedp);
-static int next_wr_addr_simul(SCSI *scgp, track_t *trackp, long *ap);
-static int cdr_write_simul(SCSI *scgp, caddr_t bp, long sectaddr, long size,
+static int simul_load(SCSI *usalp, cdr_t *);
+static int simul_unload(SCSI *usalp, cdr_t *);
+static cdr_t *identify_simul(SCSI *usalp, cdr_t *, struct scsi_inquiry *);
+static int init_simul(SCSI *usalp, cdr_t *dp);
+static int getdisktype_simul(SCSI *usalp, cdr_t *dp);
+static int speed_select_simul(SCSI *usalp, cdr_t *dp, int *speedp);
+static int next_wr_addr_simul(SCSI *usalp, track_t *trackp, long *ap);
+static int cdr_write_simul(SCSI *usalp, caddr_t bp, long sectaddr, long size,
int blocks, BOOL islast);
-static int open_track_simul(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int close_track_simul(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int open_session_simul(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int fixate_simul(SCSI *scgp, cdr_t *dp, track_t *trackp);
+static int open_track_simul(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int close_track_simul(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int open_session_simul(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int fixate_simul(SCSI *usalp, cdr_t *dp, track_t *trackp);
static void tv_sub(struct timeval *tvp1, struct timeval *tvp2);
-static int simul_load(SCSI *scgp, cdr_t *dp)
+static int simul_load(SCSI *usalp, cdr_t *dp)
{
return (0);
}
-static int simul_unload(SCSI *scgp, cdr_t *dp)
+static int simul_unload(SCSI *usalp, cdr_t *dp)
{
return (0);
}
@@ -113,7 +113,7 @@
(int(*)(SCSI *, Ulong))cmd_ill, /* reserve_track */
cdr_write_simul,
(int(*)(track_t *, void *, BOOL))cmd_dummy, /* gen_cue */
- (int(*)(SCSI *scgp, cdr_t *, track_t *))cmd_dummy, /* send_cue */
+ (int(*)(SCSI *usalp, cdr_t *, track_t *))cmd_dummy, /* send_cue */
(int(*)(SCSI *, cdr_t *, track_t *))cmd_dummy, /* leadin */
open_track_simul,
close_track_simul,
@@ -154,7 +154,7 @@
(int(*)(SCSI *, Ulong))cmd_ill, /* reserve_track */
cdr_write_simul,
(int(*)(track_t *, void *, BOOL))cmd_dummy, /* gen_cue */
- (int(*)(SCSI *scgp, cdr_t *, track_t *))cmd_dummy, /* send_cue */
+ (int(*)(SCSI *usalp, cdr_t *, track_t *))cmd_dummy, /* send_cue */
(int(*)(SCSI *, cdr_t *, track_t *))cmd_dummy, /* leadin */
open_track_simul,
close_track_simul,
@@ -172,7 +172,7 @@
};
static cdr_t *
-identify_simul(SCSI *scgp, cdr_t *dp, struct scsi_inquiry *ip)
+identify_simul(SCSI *usalp, cdr_t *dp, struct scsi_inquiry *ip)
{
return (dp);
}
@@ -187,13 +187,13 @@
static Uint sleep_min;
static int
-init_simul(SCSI *scgp, cdr_t *dp)
+init_simul(SCSI *usalp, cdr_t *dp)
{
- return (speed_select_simul(scgp, dp, NULL));
+ return (speed_select_simul(usalp, dp, NULL));
}
static int
-getdisktype_simul(SCSI *scgp, cdr_t *dp)
+getdisktype_simul(SCSI *usalp, cdr_t *dp)
{
dstat_t *dsp = dp->cdr_dstat;
@@ -206,12 +206,12 @@
dsp->ds_flags |= DSF_DVD;
simul_isdvd = TRUE;
}
- return (drive_getdisktype(scgp, dp));
+ return (drive_getdisktype(usalp, dp));
}
static int
-speed_select_simul(SCSI *scgp, cdr_t *dp, int *speedp)
+speed_select_simul(SCSI *usalp, cdr_t *dp, int *speedp)
{
long val;
char *p;
@@ -253,7 +253,7 @@
}
static int
-next_wr_addr_simul(SCSI *scgp, track_t *trackp, long *ap)
+next_wr_addr_simul(SCSI *usalp, track_t *trackp, long *ap)
{
/*
* This will most likely not 100% correct for TAO CDs
@@ -266,7 +266,7 @@
static int
-cdr_write_simul(SCSI *scgp, caddr_t bp /* address of buffer */,
+cdr_write_simul(SCSI *usalp, caddr_t bp /* address of buffer */,
long sectaddr /* disk address (sector) to put */,
long size /* number of bytes to transfer */,
int blocks /* sector count */,
@@ -349,14 +349,14 @@
}
static int
-open_track_simul(SCSI *scgp, cdr_t *dp, track_t *trackp)
+open_track_simul(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
sleep_min = 999 * 1000000;
return (0);
}
static int
-close_track_simul(SCSI *scgp, cdr_t *dp, track_t *trackp)
+close_track_simul(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
if (lverbose) {
printf("Remaining reserve time in drive buffer: %d.%3.3d ms\n",
@@ -372,14 +372,14 @@
}
static int
-open_session_simul(SCSI *scgp, cdr_t *dp, track_t *trackp)
+open_session_simul(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
simul_nwa = 0L;
return (0);
}
static int
-fixate_simul(SCSI *scgp, cdr_t *dp, track_t *trackp)
+fixate_simul(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
return (0);
}
Modified: cdrkit/trunk/wodim/drv_sony.c
===================================================================
--- cdrkit/trunk/wodim/drv_sony.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/drv_sony.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -54,16 +54,16 @@
#include <intcvt.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsidefs.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsidefs.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include "wodim.h"
#ifdef SONY_DEBUG
-# define inc_verbose() scgp->verbose++
-# define dec_verbose() scgp->verbose--
+# define inc_verbose() usalp->verbose++
+# define dec_verbose() usalp->verbose--
#else
# define inc_verbose()
# define dec_verbose()
@@ -212,41 +212,41 @@
#define strbeg(s1, s2) (strstr((s2), (s1)) == (s2))
-static int write_start_sony(SCSI *scgp, caddr_t bp, int size);
-static int write_continue_sony(SCSI *scgp, caddr_t bp, long sectaddr,
+static int write_start_sony(SCSI *usalp, caddr_t bp, int size);
+static int write_continue_sony(SCSI *usalp, caddr_t bp, long sectaddr,
long size, int blocks, BOOL islast);
-static int discontinue_sony(SCSI *scgp);
-static int write_track_sony(SCSI *scgp, long track, int sectype);
-static int close_track_sony(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int flush_sony(SCSI *scgp, int track);
-static int finalize_sony(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int recover_sony(SCSI *scgp, cdr_t *dp, int track);
-static int set_wr_parameter_sony(SCSI *scgp, caddr_t bp, int size);
-static int next_wr_addr_sony(SCSI *scgp, track_t *trackp, long *ap);
-static int reserve_track_sony(SCSI *scgp, unsigned long len);
-static int init_sony(SCSI *scgp, cdr_t *dp);
-static int getdisktype_sony(SCSI *scgp, cdr_t *dp);
+static int discontinue_sony(SCSI *usalp);
+static int write_track_sony(SCSI *usalp, long track, int sectype);
+static int close_track_sony(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int flush_sony(SCSI *usalp, int track);
+static int finalize_sony(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int recover_sony(SCSI *usalp, cdr_t *dp, int track);
+static int set_wr_parameter_sony(SCSI *usalp, caddr_t bp, int size);
+static int next_wr_addr_sony(SCSI *usalp, track_t *trackp, long *ap);
+static int reserve_track_sony(SCSI *usalp, unsigned long len);
+static int init_sony(SCSI *usalp, cdr_t *dp);
+static int getdisktype_sony(SCSI *usalp, cdr_t *dp);
static void di_to_dstat_sony(struct sony_924_mode_page_22 *dip,
dstat_t *dsp);
-static int speed_select_sony(SCSI *scgp, cdr_t *dp, int *speedp);
-static int next_writable_address_sony(SCSI *scgp, long *ap, int track,
+static int speed_select_sony(SCSI *usalp, cdr_t *dp, int *speedp);
+static int next_writable_address_sony(SCSI *usalp, long *ap, int track,
int sectype, int tracktype);
-static int new_track_sony(SCSI *scgp, int track, int sectype,
+static int new_track_sony(SCSI *usalp, int track, int sectype,
int tracktype);
-static int open_track_sony(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int open_session_sony(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int abort_session_sony(SCSI *scgp, cdr_t *dp);
-static int get_page22_sony(SCSI *scgp, char *mode);
+static int open_track_sony(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int open_session_sony(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int abort_session_sony(SCSI *usalp, cdr_t *dp);
+static int get_page22_sony(SCSI *usalp, char *mode);
static int gen_cue_sony(track_t *trackp, void *vcuep, BOOL needgap);
static void fillcue(struct sony_cue *cp, int ca, int tno, int idx, int dataform, int scms, msf_t *mp);
-static int send_cue_sony(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int write_leadin_sony(SCSI *scgp, cdr_t *dp, track_t *trackp);
-static int sony_attach(SCSI *scgp, cdr_t *dp);
+static int send_cue_sony(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int write_leadin_sony(SCSI *usalp, cdr_t *dp, track_t *trackp);
+static int sony_attach(SCSI *usalp, cdr_t *dp);
#ifdef SONY_DEBUG
static void print_sony_mp22(struct sony_924_mode_page_22 *xp, int len);
static void print_sony_mp23(struct sony_924_mode_page_23 *xp, int len);
#endif
-static int buf_cap_sony(SCSI *scgp, long *, long *);
+static int buf_cap_sony(SCSI *usalp, long *, long *);
cdr_t cdr_sony_cdu924 = {
0, 0,
@@ -290,9 +290,9 @@
};
static int
-write_start_sony(SCSI *scgp, caddr_t bp, int size)
+write_start_sony(SCSI *usalp, caddr_t bp, int size)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -302,25 +302,25 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->sense_len = 26;
scmd->cdb.g1_cdb.cmd = 0xE0;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g0_cdbaddr(&scmd->cdb.g0_cdb, size); /* Hack, but Sony is silly */
- scgp->cmdname = "write_start";
+ usalp->cmdname = "write_start";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-write_continue_sony(SCSI *scgp,
+write_continue_sony(SCSI *usalp,
caddr_t bp /* address of buffer */,
long sectaddr /* disk address (sector) to put */,
long size /* number of bytes to transfer */,
int blocks /* sector count */,
BOOL islast /* last write for track */)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -329,67 +329,67 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xE1;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g0_cdbaddr(&scmd->cdb.g0_cdb, size); /* Hack, but Sony is silly */
- scgp->cmdname = "write_continue";
+ usalp->cmdname = "write_continue";
- if (scg_cmd(scgp) < 0) {
+ if (usal_cmd(usalp) < 0) {
/*
* XXX This seems to happen only sometimes.
*/
- if (scg_sense_code(scgp) != 0x80)
+ if (usal_sense_code(usalp) != 0x80)
return (-1);
}
- return (size - scg_getresid(scgp));
+ return (size - usal_getresid(usalp));
}
static int
-discontinue_sony(SCSI *scgp)
+discontinue_sony(SCSI *usalp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA|SCG_CMD_RETRY;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xE2;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
- scgp->cmdname = "discontinue";
+ usalp->cmdname = "discontinue";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-write_track_sony(SCSI *scgp,
+write_track_sony(SCSI *usalp,
long track /* track number 0 == new track */,
int sectype /* no sectype for Sony write track */)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA|SCG_CMD_RETRY;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xF5;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdbaddr(&scmd->cdb.g1_cdb, track);
- scgp->cmdname = "write_track";
+ usalp->cmdname = "write_track";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
/* XXX NOCH NICHT FERTIG */
static int
-close_track_sony(SCSI *scgp, cdr_t *dp, track_t *trackp)
+close_track_sony(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
int track = 0;
if (!is_tao(trackp) && !is_packet(trackp))
@@ -400,37 +400,37 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xF0;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdbaddr(&scmd->cdb.g1_cdb, track);
/* XXX Padding ??? (bit 0 in addr[0] / CDB[2]) */
- scgp->cmdname = "close_track";
+ usalp->cmdname = "close_track";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
/*
* Clear the silly "error situation" from Sony´ dummy write end
* but notify if real errors occurred.
*/
- scgp->silent++;
- if (test_unit_ready(scgp) < 0 && scg_sense_code(scgp) != 0xD4) {
- scgp->cmdname = "close_track/test_unit_ready";
- scg_printerr(scgp);
+ usalp->silent++;
+ if (test_unit_ready(usalp) < 0 && usal_sense_code(usalp) != 0xD4) {
+ usalp->cmdname = "close_track/test_unit_ready";
+ usal_printerr(usalp);
}
- scgp->silent--;
+ usalp->silent--;
return (0);
}
static int
-finalize_sony(SCSI *scgp, cdr_t *dp, track_t *trackp)
+finalize_sony(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
int dummy = track_base(trackp)->tracktype & TOCF_DUMMY;
if (!is_tao(trackp) && !is_packet(trackp)) {
- wait_unit_ready(scgp, 240);
+ wait_unit_ready(usalp, 240);
return (0);
}
if (dummy) {
@@ -443,21 +443,21 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->timeout = 8 * 60; /* Needs up to 4 minutes */
scmd->cdb.g1_cdb.cmd = 0xF1;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.count[1] = ((track_base(trackp)->tracktype & TOCF_MULTI) ? 1 : 0);
/* XXX Padding ??? (bit 0 in addr[0] / CDB[2]) */
- scgp->cmdname = "finalize";
+ usalp->cmdname = "finalize";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-flush_sony(SCSI *scgp, int track)
+flush_sony(SCSI *usalp, int track)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
@@ -465,43 +465,43 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->timeout = 8 * 60; /* Needs up to 4 minutes */
scmd->cdb.g1_cdb.cmd = 0xF2;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.cmd_cdb[5] = track;
/* XXX POE ??? (bit 1 in addr[0] / CDB[2]) */
/* XXX Padding ??? (bit 0 in addr[0] / CDB[2]) */
/* XXX Partial flush ??? (CDB[3]) */
- scgp->cmdname = "flush";
+ usalp->cmdname = "flush";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-recover_sony(SCSI *scgp, cdr_t *dp, int track)
+recover_sony(SCSI *usalp, cdr_t *dp, int track)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xF6;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.addr[3] = track;
- scgp->cmdname = "recover";
+ usalp->cmdname = "recover";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-set_wr_parameter_sony(SCSI *scgp, caddr_t bp, int size)
+set_wr_parameter_sony(SCSI *usalp, caddr_t bp, int size)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -510,55 +510,55 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xF8;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdblen(&scmd->cdb.g1_cdb, size);
- scgp->cmdname = "set_write_parameter";
+ usalp->cmdname = "set_write_parameter";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-next_wr_addr_sony(SCSI *scgp, track_t *trackp, long *ap)
+next_wr_addr_sony(SCSI *usalp, track_t *trackp, long *ap)
{
- if (next_writable_address_sony(scgp, ap, 0, 0, 0) < 0)
+ if (next_writable_address_sony(usalp, ap, 0, 0, 0) < 0)
return (-1);
return (0);
}
static int
-reserve_track_sony(SCSI *scgp, unsigned long len)
+reserve_track_sony(SCSI *usalp, unsigned long len)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xF3;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
i_to_4_byte(&scmd->cdb.g1_cdb.addr[3], len);
- scgp->cmdname = "reserve_track";
+ usalp->cmdname = "reserve_track";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
static int
-init_sony(SCSI *scgp, cdr_t *dp)
+init_sony(SCSI *usalp, cdr_t *dp)
{
- return (speed_select_sony(scgp, dp, NULL));
+ return (speed_select_sony(usalp, dp, NULL));
}
#define IS(what, flag) printf(" Is %s%s\n", flag?"":"not ", what);
static int
-getdisktype_sony(SCSI *scgp, cdr_t *dp)
+getdisktype_sony(SCSI *usalp, cdr_t *dp)
{
dstat_t *dsp = dp->cdr_dstat;
long dummy;
@@ -569,7 +569,7 @@
struct scsi_mode_page_header *mp;
struct sony_924_mode_page_22 *xp;
- dummy = get_page22_sony(scgp, mode);
+ dummy = get_page22_sony(usalp, mode);
if (dummy >= 0) {
mp = (struct scsi_mode_page_header *)
(mode + sizeof (struct scsi_mode_header) +
@@ -580,7 +580,7 @@
if (xp->disk_appl_code[0] == 0xFF)
dummy = -1;
} else {
- return (drive_getdisktype(scgp, dp));
+ return (drive_getdisktype(usalp, dp));
}
if ((dp->cdr_dstat->ds_cdrflags & RF_PRATIP) != 0 && dummy >= 0) {
@@ -624,7 +624,7 @@
}
if (dummy >= 0)
di_to_dstat_sony(xp, dsp);
- return (drive_getdisktype(scgp, dp));
+ return (drive_getdisktype(usalp, dp));
}
static void
@@ -689,7 +689,7 @@
};
static int
-speed_select_sony(SCSI *scgp, cdr_t *dp, int *speedp)
+speed_select_sony(SCSI *usalp, cdr_t *dp, int *speedp)
{
struct cdd_52x_mode_data md;
int count;
@@ -718,7 +718,7 @@
*/
md.pagex.page_s20.cue_sheet_opt = 0x03;
- err = mode_select(scgp, (Uchar *)&md, count, 0, 1);
+ err = mode_select(usalp, (Uchar *)&md, count, 0, 1);
if (err < 0)
return (err);
@@ -734,11 +734,11 @@
md.pagex.page_s31.p_len = 0x02;
md.pagex.page_s31.speed = sony_speeds[speed];
- return (mode_select(scgp, (Uchar *)&md, count, 0, 1));
+ return (mode_select(usalp, (Uchar *)&md, count, 0, 1));
}
static int
-next_writable_address_sony(SCSI *scgp, long *ap, int track, int sectype,
+next_writable_address_sony(SCSI *usalp, long *ap, int track, int sectype,
int tracktype)
{
struct scsi_mode_page_header *mp;
@@ -750,7 +750,7 @@
fillbytes((caddr_t)mode, sizeof (mode), '\0');
inc_verbose();
- if (!get_mode_params(scgp, page, "CD track information",
+ if (!get_mode_params(usalp, page, "CD track information",
(Uchar *)mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
dec_verbose();
return (-1);
@@ -776,7 +776,7 @@
static int
-new_track_sony(SCSI *scgp, int track, int sectype, int tracktype)
+new_track_sony(SCSI *usalp, int track, int sectype, int tracktype)
{
struct scsi_mode_page_header *mp;
char mode[256];
@@ -786,12 +786,12 @@
int i;
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- get_page22_sony(scgp, mode);
+ get_page22_sony(usalp, mode);
fillbytes((caddr_t)mode, sizeof (mode), '\0');
inc_verbose();
- if (!get_mode_params(scgp, page, "CD track information",
+ if (!get_mode_params(usalp, page, "CD track information",
(Uchar *)mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
dec_verbose();
return (-1);
@@ -837,7 +837,7 @@
0);
}
- if (mode_select(scgp, (Uchar *)mode, len, 0, scgp->inq->data_format >= 2) < 0) {
+ if (mode_select(usalp, (Uchar *)mode, len, 0, usalp->inq->data_format >= 2) < 0) {
return (-1);
}
@@ -845,7 +845,7 @@
}
static int
-open_track_sony(SCSI *scgp, cdr_t *dp, track_t *trackp)
+open_track_sony(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
if (!is_tao(trackp) && !is_packet(trackp)) {
if (trackp->pregapsize > 0 && (trackp->flags & TI_PREGAP) == 0) {
@@ -857,7 +857,7 @@
/*
* XXX Do we need to check isecsize too?
*/
- pad_track(scgp, dp, trackp,
+ pad_track(usalp, dp, trackp,
trackp->trackstart-trackp->pregapsize,
(Llong)trackp->pregapsize*trackp->secsize,
FALSE, 0);
@@ -865,20 +865,20 @@
return (0);
}
- if (select_secsize(scgp, trackp->secsize) < 0)
+ if (select_secsize(usalp, trackp->secsize) < 0)
return (-1);
- if (new_track_sony(scgp, trackp->trackno, trackp->sectype, trackp->tracktype & TOC_MASK) < 0)
+ if (new_track_sony(usalp, trackp->trackno, trackp->sectype, trackp->tracktype & TOC_MASK) < 0)
return (-1);
- if (write_track_sony(scgp, 0L, trackp->sectype) < 0)
+ if (write_track_sony(usalp, 0L, trackp->sectype) < 0)
return (-1);
return (0);
}
static int
-open_session_sony(SCSI *scgp, cdr_t *dp, track_t *trackp)
+open_session_sony(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
struct scsi_mode_page_header *mp;
char mode[256];
@@ -888,7 +888,7 @@
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- if ((len = get_page22_sony(scgp, mode)) < 0)
+ if ((len = get_page22_sony(usalp, mode)) < 0)
return (-1);
mp = (struct scsi_mode_page_header *)
@@ -928,24 +928,24 @@
0);
}
- if (mode_select(scgp, (Uchar *)mode, len, 0, scgp->inq->data_format >= 2) < 0) {
+ if (mode_select(usalp, (Uchar *)mode, len, 0, usalp->inq->data_format >= 2) < 0) {
return (-1);
}
/*
* XXX set write parameter für SAO mit Multi Session (948 only?)
- * XXX set_wr_parameter_sony(scgp, bp, size);
+ * XXX set_wr_parameter_sony(usalp, bp, size);
*/
return (0);
}
static int
-abort_session_sony(SCSI *scgp, cdr_t *dp)
+abort_session_sony(SCSI *usalp, cdr_t *dp)
{
- return (discontinue_sony(scgp));
+ return (discontinue_sony(usalp));
}
static int
-get_page22_sony(SCSI *scgp, char *mode)
+get_page22_sony(SCSI *usalp, char *mode)
{
struct scsi_mode_page_header *mp;
int len = 0x30;
@@ -955,7 +955,7 @@
fillbytes((caddr_t)mode, sizeof (mode), '\0');
inc_verbose();
- if (!get_mode_params(scgp, page, "CD disk information",
+ if (!get_mode_params(usalp, page, "CD disk information",
(Uchar *)mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
dec_verbose();
return (-1);
@@ -1096,7 +1096,7 @@
if (lverbose > 1) {
for (i = 0; i < ncue; i++) {
- scg_prbytes("", (Uchar *)&cue[i], 8);
+ usal_prbytes("", (Uchar *)&cue[i], 8);
}
}
if (cuep)
@@ -1130,7 +1130,7 @@
}
static int
-send_cue_sony(SCSI *scgp, cdr_t *dp, track_t *trackp)
+send_cue_sony(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
struct sony_cue *cp;
int ncue;
@@ -1155,14 +1155,14 @@
stoptime = starttime;
gettimeofday(&starttime, (struct timezone *)0);
- scgp->silent++;
- ret = write_start_sony(scgp, (caddr_t)cp, ncue*8);
- scgp->silent--;
+ usalp->silent++;
+ ret = write_start_sony(usalp, (caddr_t)cp, ncue*8);
+ usalp->silent--;
free(cp);
if (ret < 0) {
errmsgno(EX_BAD, "CUE sheet not accepted. Retrying with minimum pregapsize = 1.\n");
ncue = (*dp->cdr_gen_cue)(trackp, &cp, TRUE);
- ret = write_start_sony(scgp, (caddr_t)cp, ncue*8);
+ ret = write_start_sony(usalp, (caddr_t)cp, ncue*8);
free(cp);
}
if (ret >= 0 && lverbose) {
@@ -1173,7 +1173,7 @@
}
static int
-write_leadin_sony(SCSI *scgp, cdr_t *dp, track_t *trackp)
+write_leadin_sony(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
Uint i;
long startsec = 0L;
@@ -1192,7 +1192,7 @@
trackp[0].flags &= ~TI_TEXT;
}
}
- if ((*dp->cdr_send_cue)(scgp, dp, trackp) < 0) {
+ if ((*dp->cdr_send_cue)(usalp, dp, trackp) < 0) {
errmsgno(EX_BAD, "Cannot send CUE sheet.\n");
return (-1);
}
@@ -1213,7 +1213,7 @@
}
if (debug || lverbose)
printf("Writing lead-in...\n");
- if (write_cdtext(scgp, dp, startsec) < 0)
+ if (write_cdtext(usalp, dp, startsec) < 0)
return (-1);
dp->cdr_dstat->ds_cdrflags |= RF_LEADIN;
@@ -1270,14 +1270,14 @@
};
static int
-sony_attach(SCSI *scgp, cdr_t *dp)
+sony_attach(SCSI *usalp, cdr_t *dp)
{
- if (scgp->inq != NULL) {
- if (strbeg("CD-R CDU94", scgp->inq->prod_ident)) {
+ if (usalp->inq != NULL) {
+ if (strbeg("CD-R CDU94", usalp->inq->prod_ident)) {
dp->cdr_speeddef = 4;
}
}
- scg_setnonstderrs(scgp, sd_cdu_924_error_str);
+ usal_setnonstderrs(usalp, sd_cdu_924_error_str);
return (0);
}
@@ -1325,13 +1325,13 @@
#endif
static int
-buf_cap_sony(SCSI *scgp, long *sp, long *fp)
+buf_cap_sony(SCSI *usalp, long *sp, long *fp)
{
char resp[8];
Ulong freespace;
Ulong bufsize;
int per;
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)resp;
@@ -1340,11 +1340,11 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xEC; /* Read buffer cap */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
- scgp->cmdname = "read buffer cap sony";
+ usalp->cmdname = "read buffer cap sony";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
bufsize = a_to_u_3_byte(&resp[1]);
@@ -1354,7 +1354,7 @@
if (fp)
*fp = freespace;
- if (scgp->verbose || (sp == 0 && fp == 0))
+ if (usalp->verbose || (sp == 0 && fp == 0))
printf("BFree: %ld K BSize: %ld K\n", freespace >> 10, bufsize >> 10);
if (bufsize == 0)
Modified: cdrkit/trunk/wodim/modes.c
===================================================================
--- cdrkit/trunk/wodim/modes.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/modes.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -39,25 +39,25 @@
#include <utypes.h>
#include <standard.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include "wodim.h"
int scsi_compliant;
-static BOOL has_mode_page(SCSI *scgp, int page, char *pagename, int *lenp);
-BOOL get_mode_params(SCSI *scgp, int page, char *pagename, Uchar *modep,
+static BOOL has_mode_page(SCSI *usalp, int page, char *pagename, int *lenp);
+BOOL get_mode_params(SCSI *usalp, int page, char *pagename, Uchar *modep,
Uchar *cmodep, Uchar *dmodep, Uchar *smodep, int *lenp);
-BOOL set_mode_params(SCSI *scgp, char *pagename, Uchar *modep, int len,
+BOOL set_mode_params(SCSI *usalp, char *pagename, Uchar *modep, int len,
int save, int secsize);
#define XXX
#ifdef XXX
static BOOL
-has_mode_page(SCSI *scgp, int page, char *pagename, int *lenp)
+has_mode_page(SCSI *usalp, int page, char *pagename, int *lenp)
{
Uchar mode[0x100];
int hdlen;
@@ -75,23 +75,23 @@
* IOMEGA claims that they are using Philips clone drives but a Philips
* drive I own does not have the problem.
*/
- if ((scgp->dflags & DRF_MODE_DMA_OVR) != 0)
+ if ((usalp->dflags & DRF_MODE_DMA_OVR) != 0)
len = sizeof (struct scsi_mode_header);
again:
fillbytes((caddr_t)mode, sizeof (mode), '\0');
if (lenp)
*lenp = 0;
- scgp->silent++;
- (void) unit_ready(scgp);
+ usalp->silent++;
+ (void) unit_ready(usalp);
/* Maxoptix bringt Aborted cmd 0x0B mit code 0x4E (overlapping cmds)*/
/*
* The Matsushita CW-7502 will sometimes deliver a zeroed
* mode page 2A if "Page n default" is used instead of "current".
*/
- if (mode_sense(scgp, mode, len, page, 0) < 0) { /* Page n current */
- scgp->silent--;
+ if (mode_sense(usalp, mode, len, page, 0) < 0) { /* Page n current */
+ usalp->silent--;
if (len < (int)sizeof (struct scsi_mode_header) && try == 0) {
len = sizeof (struct scsi_mode_header);
goto again;
@@ -103,12 +103,12 @@
* If we come here, we got a hard failure with the
* fist try. Remember this (IOMEGA USB) firmware bug.
*/
- if ((scgp->dflags & DRF_MODE_DMA_OVR) == 0) {
+ if ((usalp->dflags & DRF_MODE_DMA_OVR) == 0) {
/* XXX if (!nowarn) */
errmsgno(EX_BAD,
"Warning: controller creates hard SCSI failure when retrieving %s page.\n",
pagename);
- scgp->dflags |= DRF_MODE_DMA_OVR;
+ usalp->dflags |= DRF_MODE_DMA_OVR;
}
}
len = ((struct scsi_mode_header *)mode)->sense_data_len + 1;
@@ -117,20 +117,20 @@
* ATAPI drives as used by IOMEGA may receive a SCSI bus device reset
* in between these two mode sense commands.
*/
- (void) unit_ready(scgp);
- if (mode_sense(scgp, mode, len, page, 0) < 0) { /* Page n current */
- scgp->silent--;
+ (void) unit_ready(usalp);
+ if (mode_sense(usalp, mode, len, page, 0) < 0) { /* Page n current */
+ usalp->silent--;
return (FALSE);
}
- scgp->silent--;
+ usalp->silent--;
- if (scgp->verbose)
- scg_prbytes("Mode Sense Data", mode, len - scg_getresid(scgp));
+ if (usalp->verbose)
+ usal_prbytes("Mode Sense Data", mode, len - usal_getresid(usalp));
hdlen = sizeof (struct scsi_mode_header) +
((struct scsi_mode_header *)mode)->blockdesc_len;
mp = (struct scsi_mode_page_header *)(mode + hdlen);
- if (scgp->verbose)
- scg_prbytes("Mode Page Data", (Uchar *)mp, mp->p_len+2);
+ if (usalp->verbose)
+ usal_prbytes("Mode Page Data", (Uchar *)mp, mp->p_len+2);
if (mp->p_len == 0) {
if (!scsi_compliant && try == 0) {
@@ -175,7 +175,7 @@
#endif
BOOL
-get_mode_params(SCSI *scgp, int page, char *pagename, Uchar *modep,
+get_mode_params(SCSI *usalp, int page, char *pagename, Uchar *modep,
Uchar *cmodep, Uchar *dmodep, Uchar *smodep, int *lenp)
{
int len;
@@ -184,8 +184,8 @@
#ifdef XXX
if (lenp)
*lenp = 0;
- if (!has_mode_page(scgp, page, pagename, &len)) {
- if (!scgp->silent) errmsgno(EX_BAD,
+ if (!has_mode_page(usalp, page, pagename, &len)) {
+ if (!usalp->silent) errmsgno(EX_BAD,
"Warning: controller does not support %s page.\n",
pagename);
return (FALSE);
@@ -199,54 +199,54 @@
if (modep) {
fillbytes(modep, 0x100, '\0');
- scgp->silent++;
- (void) unit_ready(scgp);
- scgp->silent--;
- if (mode_sense(scgp, modep, len, page, 0) < 0) { /* Page x current */
+ usalp->silent++;
+ (void) unit_ready(usalp);
+ usalp->silent--;
+ if (mode_sense(usalp, modep, len, page, 0) < 0) { /* Page x current */
errmsgno(EX_BAD, "Cannot get %s data.\n", pagename);
ret = FALSE;
- } else if (scgp->verbose) {
- scg_prbytes("Mode Sense Data", modep, len - scg_getresid(scgp));
+ } else if (usalp->verbose) {
+ usal_prbytes("Mode Sense Data", modep, len - usal_getresid(usalp));
}
}
if (cmodep) {
fillbytes(cmodep, 0x100, '\0');
- scgp->silent++;
- (void) unit_ready(scgp);
- scgp->silent--;
- if (mode_sense(scgp, cmodep, len, page, 1) < 0) { /* Page x change */
+ usalp->silent++;
+ (void) unit_ready(usalp);
+ usalp->silent--;
+ if (mode_sense(usalp, cmodep, len, page, 1) < 0) { /* Page x change */
errmsgno(EX_BAD, "Cannot get %s mask.\n", pagename);
ret = FALSE;
- } else if (scgp->verbose) {
- scg_prbytes("Mode Sense Data", cmodep, len - scg_getresid(scgp));
+ } else if (usalp->verbose) {
+ usal_prbytes("Mode Sense Data", cmodep, len - usal_getresid(usalp));
}
}
if (dmodep) {
fillbytes(dmodep, 0x100, '\0');
- scgp->silent++;
- (void) unit_ready(scgp);
- scgp->silent--;
- if (mode_sense(scgp, dmodep, len, page, 2) < 0) { /* Page x default */
+ usalp->silent++;
+ (void) unit_ready(usalp);
+ usalp->silent--;
+ if (mode_sense(usalp, dmodep, len, page, 2) < 0) { /* Page x default */
errmsgno(EX_BAD, "Cannot get default %s data.\n",
pagename);
ret = FALSE;
- } else if (scgp->verbose) {
- scg_prbytes("Mode Sense Data", dmodep, len - scg_getresid(scgp));
+ } else if (usalp->verbose) {
+ usal_prbytes("Mode Sense Data", dmodep, len - usal_getresid(usalp));
}
}
if (smodep) {
fillbytes(smodep, 0x100, '\0');
- scgp->silent++;
- (void) unit_ready(scgp);
- scgp->silent--;
- if (mode_sense(scgp, smodep, len, page, 3) < 0) { /* Page x saved */
+ usalp->silent++;
+ (void) unit_ready(usalp);
+ usalp->silent--;
+ if (mode_sense(usalp, smodep, len, page, 3) < 0) { /* Page x saved */
errmsgno(EX_BAD, "Cannot get saved %s data.\n", pagename);
ret = FALSE;
- } else if (scgp->verbose) {
- scg_prbytes("Mode Sense Data", smodep, len - scg_getresid(scgp));
+ } else if (usalp->verbose) {
+ usal_prbytes("Mode Sense Data", smodep, len - usal_getresid(usalp));
}
}
@@ -254,7 +254,7 @@
}
BOOL
-set_mode_params(SCSI *scgp, char *pagename, Uchar *modep, int len, int save,
+set_mode_params(SCSI *usalp, char *pagename, Uchar *modep, int len, int save,
int secsize)
{
int i;
@@ -272,19 +272,19 @@
secsize);
}
- scgp->silent++;
- (void) unit_ready(scgp);
- scgp->silent--;
- if (save == 0 || mode_select(scgp, modep, len, save, scgp->inq->data_format >= 2) < 0) {
- scgp->silent++;
- (void) unit_ready(scgp);
- scgp->silent--;
- if (mode_select(scgp, modep, len, 0, scgp->inq->data_format >= 2) < 0) {
- if (scgp->silent == 0) {
+ usalp->silent++;
+ (void) unit_ready(usalp);
+ usalp->silent--;
+ if (save == 0 || mode_select(usalp, modep, len, save, usalp->inq->data_format >= 2) < 0) {
+ usalp->silent++;
+ (void) unit_ready(usalp);
+ usalp->silent--;
+ if (mode_select(usalp, modep, len, 0, usalp->inq->data_format >= 2) < 0) {
+ if (usalp->silent == 0) {
errmsgno(EX_BAD,
"Warning: using default %s data.\n",
pagename);
- scg_prbytes("Mode Select Data", modep, len);
+ usal_prbytes("Mode Select Data", modep, len);
}
return (FALSE);
}
Modified: cdrkit/trunk/wodim/scsi_cdr.c
===================================================================
--- cdrkit/trunk/wodim/scsi_cdr.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/scsi_cdr.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -64,162 +64,162 @@
#include <intcvt.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsidefs.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsidefs.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include "scsimmc.h"
#include "wodim.h"
#define strbeg(s1, s2) (strstr((s2), (s1)) == (s2))
-BOOL unit_ready(SCSI *scgp);
-BOOL wait_unit_ready(SCSI *scgp, int secs);
-BOOL scsi_in_progress(SCSI *scgp);
-BOOL cdr_underrun(SCSI *scgp);
-int test_unit_ready(SCSI *scgp);
-int rezero_unit(SCSI *scgp);
-int request_sense(SCSI *scgp);
-int request_sense_b(SCSI *scgp, caddr_t bp, int cnt);
-int inquiry(SCSI *scgp, caddr_t, int);
-int read_capacity(SCSI *scgp);
-void print_capacity(SCSI *scgp, FILE *f);
-int scsi_load_unload(SCSI *scgp, int);
-int scsi_prevent_removal(SCSI *scgp, int);
-int scsi_start_stop_unit(SCSI *scgp, int, int, BOOL immed);
-int scsi_set_speed(SCSI *scgp, int readspeed, int writespeed, int rotctl);
-int scsi_get_speed(SCSI *scgp, int *readspeedp, int *writespeedp);
-int qic02(SCSI *scgp, int);
-int write_xscsi(SCSI *scgp, caddr_t, long, long, int);
-int write_xg0(SCSI *scgp, caddr_t, long, long, int);
-int write_xg1(SCSI *scgp, caddr_t, long, long, int);
-int write_xg5(SCSI *scgp, caddr_t, long, long, int);
-int seek_scsi(SCSI *scgp, long addr);
-int seek_g0(SCSI *scgp, long addr);
-int seek_g1(SCSI *scgp, long addr);
-int scsi_flush_cache(SCSI *scgp, BOOL immed);
-int read_buffer(SCSI *scgp, caddr_t bp, int cnt, int mode);
-int write_buffer(SCSI *scgp, char *buffer, long length, int mode,
+BOOL unit_ready(SCSI *usalp);
+BOOL wait_unit_ready(SCSI *usalp, int secs);
+BOOL scsi_in_progress(SCSI *usalp);
+BOOL cdr_underrun(SCSI *usalp);
+int test_unit_ready(SCSI *usalp);
+int rezero_unit(SCSI *usalp);
+int request_sense(SCSI *usalp);
+int request_sense_b(SCSI *usalp, caddr_t bp, int cnt);
+int inquiry(SCSI *usalp, caddr_t, int);
+int read_capacity(SCSI *usalp);
+void print_capacity(SCSI *usalp, FILE *f);
+int scsi_load_unload(SCSI *usalp, int);
+int scsi_prevent_removal(SCSI *usalp, int);
+int scsi_start_stop_unit(SCSI *usalp, int, int, BOOL immed);
+int scsi_set_speed(SCSI *usalp, int readspeed, int writespeed, int rotctl);
+int scsi_get_speed(SCSI *usalp, int *readspeedp, int *writespeedp);
+int qic02(SCSI *usalp, int);
+int write_xscsi(SCSI *usalp, caddr_t, long, long, int);
+int write_xg0(SCSI *usalp, caddr_t, long, long, int);
+int write_xg1(SCSI *usalp, caddr_t, long, long, int);
+int write_xg5(SCSI *usalp, caddr_t, long, long, int);
+int seek_scsi(SCSI *usalp, long addr);
+int seek_g0(SCSI *usalp, long addr);
+int seek_g1(SCSI *usalp, long addr);
+int scsi_flush_cache(SCSI *usalp, BOOL immed);
+int read_buffer(SCSI *usalp, caddr_t bp, int cnt, int mode);
+int write_buffer(SCSI *usalp, char *buffer, long length, int mode,
int bufferid, long offset);
-int read_subchannel(SCSI *scgp, caddr_t bp, int track, int cnt, int msf,
+int read_subchannel(SCSI *usalp, caddr_t bp, int track, int cnt, int msf,
int subq, int fmt);
-int read_toc(SCSI *scgp, caddr_t, int, int, int, int);
-int read_toc_philips(SCSI *scgp, caddr_t, int, int, int, int);
-int read_header(SCSI *scgp, caddr_t, long, int, int);
-int read_disk_info(SCSI *scgp, caddr_t, int);
-int read_track_info(SCSI *scgp, caddr_t, int type, int addr, int cnt);
-int read_rzone_info(SCSI *scgp, caddr_t bp, int cnt);
-int reserve_tr_rzone(SCSI *scgp, long size);
-int read_dvd_structure(SCSI *scgp, caddr_t bp, int cnt, int addr, int layer,
+int read_toc(SCSI *usalp, caddr_t, int, int, int, int);
+int read_toc_philips(SCSI *usalp, caddr_t, int, int, int, int);
+int read_header(SCSI *usalp, caddr_t, long, int, int);
+int read_disk_info(SCSI *usalp, caddr_t, int);
+int read_track_info(SCSI *usalp, caddr_t, int type, int addr, int cnt);
+int read_rzone_info(SCSI *usalp, caddr_t bp, int cnt);
+int reserve_tr_rzone(SCSI *usalp, long size);
+int read_dvd_structure(SCSI *usalp, caddr_t bp, int cnt, int addr, int layer,
int fmt);
-int send_dvd_structure(SCSI *scgp, caddr_t bp, int cnt, int layer, int fmt);
-int send_opc(SCSI *scgp, caddr_t, int cnt, int doopc);
-int read_track_info_philips(SCSI *scgp, caddr_t, int, int);
-int scsi_close_tr_session(SCSI *scgp, int type, int track, BOOL immed);
-int read_master_cue(SCSI *scgp, caddr_t bp, int sheet, int cnt);
-int send_cue_sheet(SCSI *scgp, caddr_t bp, long size);
-int read_buff_cap(SCSI *scgp, long *, long *);
-int scsi_blank(SCSI *scgp, long addr, int blanktype, BOOL immed);
-int scsi_format(SCSI *scgp, caddr_t addr, int size, BOOL background);
-int scsi_set_streaming(SCSI *scgp, caddr_t addr, int size);
-BOOL allow_atapi(SCSI *scgp, BOOL new);
-int mode_select(SCSI *scgp, Uchar *, int, int, int);
-int mode_sense(SCSI *scgp, Uchar *dp, int cnt, int page, int pcf);
-int mode_select_sg0(SCSI *scgp, Uchar *, int, int, int);
-int mode_sense_sg0(SCSI *scgp, Uchar *dp, int cnt, int page, int pcf);
-int mode_select_g0(SCSI *scgp, Uchar *, int, int, int);
-int mode_select_g1(SCSI *scgp, Uchar *, int, int, int);
-int mode_sense_g0(SCSI *scgp, Uchar *dp, int cnt, int page, int pcf);
-int mode_sense_g1(SCSI *scgp, Uchar *dp, int cnt, int page, int pcf);
-int read_tochdr(SCSI *scgp, cdr_t *, int *, int *);
-int read_cdtext(SCSI *scgp);
-int read_trackinfo(SCSI *scgp, int, long *, struct msf *, int *, int *,
+int send_dvd_structure(SCSI *usalp, caddr_t bp, int cnt, int layer, int fmt);
+int send_opc(SCSI *usalp, caddr_t, int cnt, int doopc);
+int read_track_info_philips(SCSI *usalp, caddr_t, int, int);
+int scsi_close_tr_session(SCSI *usalp, int type, int track, BOOL immed);
+int read_master_cue(SCSI *usalp, caddr_t bp, int sheet, int cnt);
+int send_cue_sheet(SCSI *usalp, caddr_t bp, long size);
+int read_buff_cap(SCSI *usalp, long *, long *);
+int scsi_blank(SCSI *usalp, long addr, int blanktype, BOOL immed);
+int scsi_format(SCSI *usalp, caddr_t addr, int size, BOOL background);
+int scsi_set_streaming(SCSI *usalp, caddr_t addr, int size);
+BOOL allow_atapi(SCSI *usalp, BOOL new);
+int mode_select(SCSI *usalp, Uchar *, int, int, int);
+int mode_sense(SCSI *usalp, Uchar *dp, int cnt, int page, int pcf);
+int mode_select_sg0(SCSI *usalp, Uchar *, int, int, int);
+int mode_sense_sg0(SCSI *usalp, Uchar *dp, int cnt, int page, int pcf);
+int mode_select_g0(SCSI *usalp, Uchar *, int, int, int);
+int mode_select_g1(SCSI *usalp, Uchar *, int, int, int);
+int mode_sense_g0(SCSI *usalp, Uchar *dp, int cnt, int page, int pcf);
+int mode_sense_g1(SCSI *usalp, Uchar *dp, int cnt, int page, int pcf);
+int read_tochdr(SCSI *usalp, cdr_t *, int *, int *);
+int read_cdtext(SCSI *usalp);
+int read_trackinfo(SCSI *usalp, int, long *, struct msf *, int *, int *,
int *);
-int read_B0(SCSI *scgp, BOOL isbcd, long *b0p, long *lop);
-int read_session_offset(SCSI *scgp, long *);
-int read_session_offset_philips(SCSI *scgp, long *);
-int sense_secsize(SCSI *scgp, int current);
-int select_secsize(SCSI *scgp, int);
-BOOL is_cddrive(SCSI *scgp);
-BOOL is_unknown_dev(SCSI *scgp);
-int read_scsi(SCSI *scgp, caddr_t, long, int);
-int read_g0(SCSI *scgp, caddr_t, long, int);
-int read_g1(SCSI *scgp, caddr_t, long, int);
-BOOL getdev(SCSI *scgp, BOOL);
-void printinq(SCSI *scgp, FILE *f);
-void printdev(SCSI *scgp);
-BOOL do_inquiry(SCSI *scgp, BOOL);
-BOOL recovery_needed(SCSI *scgp, cdr_t *);
-int scsi_load(SCSI *scgp, cdr_t *);
-int scsi_unload(SCSI *scgp, cdr_t *);
-int scsi_cdr_write(SCSI *scgp, caddr_t bp, long sectaddr, long size,
+int read_B0(SCSI *usalp, BOOL isbcd, long *b0p, long *lop);
+int read_session_offset(SCSI *usalp, long *);
+int read_session_offset_philips(SCSI *usalp, long *);
+int sense_secsize(SCSI *usalp, int current);
+int select_secsize(SCSI *usalp, int);
+BOOL is_cddrive(SCSI *usalp);
+BOOL is_unknown_dev(SCSI *usalp);
+int read_scsi(SCSI *usalp, caddr_t, long, int);
+int read_g0(SCSI *usalp, caddr_t, long, int);
+int read_g1(SCSI *usalp, caddr_t, long, int);
+BOOL getdev(SCSI *usalp, BOOL);
+void printinq(SCSI *usalp, FILE *f);
+void printdev(SCSI *usalp);
+BOOL do_inquiry(SCSI *usalp, BOOL);
+BOOL recovery_needed(SCSI *usalp, cdr_t *);
+int scsi_load(SCSI *usalp, cdr_t *);
+int scsi_unload(SCSI *usalp, cdr_t *);
+int scsi_cdr_write(SCSI *usalp, caddr_t bp, long sectaddr, long size,
int blocks, BOOL islast);
-struct cd_mode_page_2A * mmc_cap(SCSI *scgp, Uchar *modep);
+struct cd_mode_page_2A * mmc_cap(SCSI *usalp, Uchar *modep);
void mmc_getval(struct cd_mode_page_2A *mp, BOOL *cdrrp, BOOL *cdwrp,
BOOL *cdrrwp, BOOL *cdwrwp, BOOL *dvdp, BOOL *dvdwp);
-BOOL is_mmc(SCSI *scgp, BOOL *cdwp, BOOL *dvdwp);
-BOOL mmc_check(SCSI *scgp, BOOL *cdrrp, BOOL *cdwrp, BOOL *cdrrwp,
+BOOL is_mmc(SCSI *usalp, BOOL *cdwp, BOOL *dvdwp);
+BOOL mmc_check(SCSI *usalp, BOOL *cdrrp, BOOL *cdwrp, BOOL *cdrrwp,
BOOL *cdwrwp, BOOL *dvdp, BOOL *dvdwp);
static void print_speed(char *fmt, int val);
-void print_capabilities(SCSI *scgp);
+void print_capabilities(SCSI *usalp);
BOOL
-unit_ready(SCSI *scgp)
+unit_ready(SCSI *usalp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
- if (test_unit_ready(scgp) >= 0) /* alles OK */
+ if (test_unit_ready(usalp) >= 0) /* alles OK */
return (TRUE);
else if (scmd->error >= SCG_FATAL) /* nicht selektierbar */
return (FALSE);
- if (scg_sense_key(scgp) == SC_UNIT_ATTENTION) {
- if (test_unit_ready(scgp) >= 0) /* alles OK */
+ if (usal_sense_key(usalp) == SC_UNIT_ATTENTION) {
+ if (test_unit_ready(usalp) >= 0) /* alles OK */
return (TRUE);
}
- if ((scg_cmd_status(scgp) & ST_BUSY) != 0) {
+ if ((usal_cmd_status(usalp) & ST_BUSY) != 0) {
/*
* Busy/reservation_conflict
*/
usleep(500000);
- if (test_unit_ready(scgp) >= 0) /* alles OK */
+ if (test_unit_ready(usalp) >= 0) /* alles OK */
return (TRUE);
}
- if (scg_sense_key(scgp) == -1) { /* non extended Sense */
- if (scg_sense_code(scgp) == 4) /* NOT_READY */
+ if (usal_sense_key(usalp) == -1) { /* non extended Sense */
+ if (usal_sense_code(usalp) == 4) /* NOT_READY */
return (FALSE);
return (TRUE);
}
/* FALSE wenn NOT_READY */
- return (scg_sense_key(scgp) != SC_NOT_READY);
+ return (usal_sense_key(usalp) != SC_NOT_READY);
}
BOOL
-wait_unit_ready(SCSI *scgp, int secs)
+wait_unit_ready(SCSI *usalp, int secs)
{
int i;
int c;
int k;
int ret;
- scgp->silent++;
- ret = test_unit_ready(scgp); /* eat up unit attention */
+ usalp->silent++;
+ ret = test_unit_ready(usalp); /* eat up unit attention */
if (ret < 0)
- ret = test_unit_ready(scgp); /* got power on condition? */
- scgp->silent--;
+ ret = test_unit_ready(usalp); /* got power on condition? */
+ usalp->silent--;
if (ret >= 0) /* success that's enough */
return (TRUE);
- scgp->silent++;
- for (i = 0; i < secs && (ret = test_unit_ready(scgp)) < 0; i++) {
- if (scgp->scmd->scb.busy != 0) {
+ usalp->silent++;
+ for (i = 0; i < secs && (ret = test_unit_ready(usalp)) < 0; i++) {
+ if (usalp->scmd->scb.busy != 0) {
sleep(1);
continue;
}
- c = scg_sense_code(scgp);
- k = scg_sense_key(scgp);
+ c = usal_sense_code(usalp);
+ k = usal_sense_key(usalp);
/*
* Abort quickly if it does not make sense to wait.
* 0x30 == Cannot read medium
@@ -227,51 +227,51 @@
*/
if ((k == SC_NOT_READY && (c == 0x3A || c == 0x30)) ||
(k == SC_MEDIUM_ERROR)) {
- if (scgp->silent <= 1)
- scg_printerr(scgp);
- scgp->silent--;
+ if (usalp->silent <= 1)
+ usal_printerr(usalp);
+ usalp->silent--;
return (FALSE);
}
sleep(1);
}
- scgp->silent--;
+ usalp->silent--;
if (ret < 0)
return (FALSE);
return (TRUE);
}
BOOL
-scsi_in_progress(SCSI *scgp)
+scsi_in_progress(SCSI *usalp)
{
- if (scg_sense_key(scgp) == SC_NOT_READY &&
+ if (usal_sense_key(usalp) == SC_NOT_READY &&
/*
* Logigal unit not ready operation/long_write in progress
*/
- scg_sense_code(scgp) == 0x04 &&
- (scg_sense_qual(scgp) == 0x04 || /* CyberDr. "format in progress"*/
- scg_sense_qual(scgp) == 0x07 || /* "operation in progress" */
- scg_sense_qual(scgp) == 0x08)) { /* "long write in progress" */
+ usal_sense_code(usalp) == 0x04 &&
+ (usal_sense_qual(usalp) == 0x04 || /* CyberDr. "format in progress"*/
+ usal_sense_qual(usalp) == 0x07 || /* "operation in progress" */
+ usal_sense_qual(usalp) == 0x08)) { /* "long write in progress" */
return (TRUE);
} else {
- if (scgp->silent <= 1)
- scg_printerr(scgp);
+ if (usalp->silent <= 1)
+ usal_printerr(usalp);
}
return (FALSE);
}
BOOL
-cdr_underrun(SCSI *scgp)
+cdr_underrun(SCSI *usalp)
{
- if ((scg_sense_key(scgp) != SC_ILLEGAL_REQUEST &&
- scg_sense_key(scgp) != SC_MEDIUM_ERROR))
+ if ((usal_sense_key(usalp) != SC_ILLEGAL_REQUEST &&
+ usal_sense_key(usalp) != SC_MEDIUM_ERROR))
return (FALSE);
- if ((scg_sense_code(scgp) == 0x21 &&
- (scg_sense_qual(scgp) == 0x00 || /* logical block address out of range */
- scg_sense_qual(scgp) == 0x02)) || /* invalid address for write */
+ if ((usal_sense_code(usalp) == 0x21 &&
+ (usal_sense_qual(usalp) == 0x00 || /* logical block address out of range */
+ usal_sense_qual(usalp) == 0x02)) || /* invalid address for write */
- (scg_sense_code(scgp) == 0x0C &&
- scg_sense_qual(scgp) == 0x09)) { /* write error - loss of streaming */
+ (usal_sense_code(usalp) == 0x0C &&
+ usal_sense_qual(usalp) == 0x09)) { /* write error - loss of streaming */
return (TRUE);
}
/*
@@ -283,28 +283,28 @@
}
int
-test_unit_ready(SCSI *scgp)
+test_unit_ready(SCSI *usalp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)0;
scmd->size = 0;
- scmd->flags = SCG_DISRE_ENA | (scgp->silent ? SCG_SILENT:0);
+ scmd->flags = SCG_DISRE_ENA | (usalp->silent ? SCG_SILENT:0);
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = SC_TEST_UNIT_READY;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
- scgp->cmdname = "test unit ready";
+ usalp->cmdname = "test unit ready";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
int
-rezero_unit(SCSI *scgp)
+rezero_unit(SCSI *usalp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)0;
@@ -313,18 +313,18 @@
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = SC_REZERO_UNIT;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
- scgp->cmdname = "rezero unit";
+ usalp->cmdname = "rezero unit";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
int
-request_sense(SCSI *scgp)
+request_sense(SCSI *usalp)
{
char sensebuf[CCS_SENSE_LEN];
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
@@ -334,21 +334,21 @@
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = SC_REQUEST_SENSE;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
scmd->cdb.g0_cdb.count = CCS_SENSE_LEN;
- scgp->cmdname = "request_sense";
+ usalp->cmdname = "request_sense";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
- scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp));
+ usal_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - usal_getresid(usalp));
return (0);
}
int
-request_sense_b(SCSI *scgp, caddr_t bp, int cnt)
+request_sense_b(SCSI *usalp, caddr_t bp, int cnt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
@@ -358,20 +358,20 @@
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = SC_REQUEST_SENSE;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
scmd->cdb.g0_cdb.count = cnt;
- scgp->cmdname = "request_sense";
+ usalp->cmdname = "request_sense";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-inquiry(SCSI *scgp, caddr_t bp, int cnt)
+inquiry(SCSI *usalp, caddr_t bp, int cnt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes(bp, cnt, '\0');
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
@@ -381,36 +381,36 @@
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = SC_INQUIRY;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
scmd->cdb.g0_cdb.count = cnt;
- scgp->cmdname = "inquiry";
+ usalp->cmdname = "inquiry";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
- if (scgp->verbose)
- scg_prbytes("Inquiry Data :", (Uchar *)bp, cnt - scg_getresid(scgp));
+ if (usalp->verbose)
+ usal_prbytes("Inquiry Data :", (Uchar *)bp, cnt - usal_getresid(usalp));
return (0);
}
int
-read_capacity(SCSI *scgp)
+read_capacity(SCSI *usalp)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
- scmd->addr = (caddr_t)scgp->cap;
+ scmd->addr = (caddr_t)usalp->cap;
scmd->size = sizeof (struct scsi_capacity);
scmd->flags = SCG_RECV_DATA|SCG_DISRE_ENA;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x25; /* Read Capacity */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdblen(&scmd->cdb.g1_cdb, 0); /* Full Media */
- scgp->cmdname = "read capacity";
+ usalp->cmdname = "read capacity";
- if (scg_cmd(scgp) < 0) {
+ if (usal_cmd(usalp) < 0) {
return (-1);
} else {
long cbsize;
@@ -420,98 +420,98 @@
* c_bsize & c_baddr are signed Int32_t
* so we use signed int conversion here.
*/
- cbsize = a_to_4_byte(&scgp->cap->c_bsize);
- cbaddr = a_to_4_byte(&scgp->cap->c_baddr);
- scgp->cap->c_bsize = cbsize;
- scgp->cap->c_baddr = cbaddr;
+ cbsize = a_to_4_byte(&usalp->cap->c_bsize);
+ cbaddr = a_to_4_byte(&usalp->cap->c_baddr);
+ usalp->cap->c_bsize = cbsize;
+ usalp->cap->c_baddr = cbaddr;
}
return (0);
}
void
-print_capacity(SCSI *scgp, FILE *f)
+print_capacity(SCSI *usalp, FILE *f)
{
long kb;
long mb;
long prmb;
double dkb;
- dkb = (scgp->cap->c_baddr+1.0) * (scgp->cap->c_bsize/1024.0);
+ dkb = (usalp->cap->c_baddr+1.0) * (usalp->cap->c_bsize/1024.0);
kb = dkb;
mb = dkb / 1024.0;
prmb = dkb / 1000.0 * 1.024;
fprintf(f, "Capacity: %ld Blocks = %ld kBytes = %ld MBytes = %ld prMB\n",
- (long)scgp->cap->c_baddr+1, kb, mb, prmb);
- fprintf(f, "Sectorsize: %ld Bytes\n", (long)scgp->cap->c_bsize);
+ (long)usalp->cap->c_baddr+1, kb, mb, prmb);
+ fprintf(f, "Sectorsize: %ld Bytes\n", (long)usalp->cap->c_bsize);
}
int
-scsi_load_unload(SCSI *scgp, int load)
+scsi_load_unload(SCSI *usalp, int load)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xA6;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
scmd->cdb.g5_cdb.addr[1] = load?3:2;
scmd->cdb.g5_cdb.count[2] = 0; /* slot # */
- scgp->cmdname = "medium load/unload";
+ usalp->cmdname = "medium load/unload";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-scsi_prevent_removal(SCSI *scgp, int prevent)
+scsi_prevent_removal(SCSI *usalp, int prevent)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = 0x1E;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
scmd->cdb.g0_cdb.count = prevent & 1;
- scgp->cmdname = "prevent/allow medium removal";
+ usalp->cmdname = "prevent/allow medium removal";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-scsi_start_stop_unit(SCSI *scgp, int flg, int loej, BOOL immed)
+scsi_start_stop_unit(SCSI *usalp, int flg, int loej, BOOL immed)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = 0x1B; /* Start Stop Unit */
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
scmd->cdb.g0_cdb.count = (flg ? 1:0) | (loej ? 2:0);
if (immed)
scmd->cdb.cmd_cdb[1] |= 0x01;
- scgp->cmdname = "start/stop unit";
+ usalp->cmdname = "start/stop unit";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
int
-scsi_set_streaming(SCSI *scgp, caddr_t perf_desc, int size)
+scsi_set_streaming(SCSI *usalp, caddr_t perf_desc, int size)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = perf_desc;
@@ -523,25 +523,25 @@
scmd->cdb.cmd_cdb[11] = 0;
scmd->cdb.cmd_cdb[10] = size;
- scgp->cmdname = "set streaming";
+ usalp->cmdname = "set streaming";
printf("scsi_set_streaming\n");
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-scsi_set_speed(SCSI *scgp, int readspeed, int writespeed, int rotctl)
+scsi_set_speed(SCSI *usalp, int readspeed, int writespeed, int rotctl)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xBB;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
if (readspeed < 0)
i_to_2_byte(&scmd->cdb.g5_cdb.addr[0], 0xFFFF);
@@ -554,23 +554,23 @@
scmd->cdb.cmd_cdb[1] |= rotctl & 0x03;
- scgp->cmdname = "set cd speed";
+ usalp->cmdname = "set cd speed";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-scsi_get_speed(SCSI *scgp, int *readspeedp, int *writespeedp)
+scsi_get_speed(SCSI *usalp, int *readspeedp, int *writespeedp)
{
struct cd_mode_page_2A *mp;
Uchar m[256];
int val;
- scgp->silent++;
- mp = mmc_cap(scgp, m); /* Get MMC capabilities in allocated mp */
- scgp->silent--;
+ usalp->silent++;
+ mp = mmc_cap(usalp, m); /* Get MMC capabilities in allocated mp */
+ usalp->silent--;
if (mp == NULL)
return (-1); /* Pre SCSI-3/mmc drive */
@@ -590,9 +590,9 @@
int
-qic02(SCSI *scgp, int cmd)
+qic02(SCSI *usalp, int cmd)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)0;
@@ -601,32 +601,32 @@
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = DEF_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = 0x0D; /* qic02 Sysgen SC4000 */
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
scmd->cdb.g0_cdb.mid_addr = cmd;
- scgp->cmdname = "qic 02";
- return (scg_cmd(scgp));
+ usalp->cmdname = "qic 02";
+ return (usal_cmd(usalp));
}
#define G0_MAXADDR 0x1FFFFFL
int
-write_xscsi(SCSI *scgp, caddr_t bp, long addr, long size, int cnt)
+write_xscsi(SCSI *usalp, caddr_t bp, long addr, long size, int cnt)
{
if (addr <= G0_MAXADDR)
- return (write_xg0(scgp, bp, addr, size, cnt));
+ return (write_xg0(usalp, bp, addr, size, cnt));
else
- return (write_xg1(scgp, bp, addr, size, cnt));
+ return (write_xg1(usalp, bp, addr, size, cnt));
}
int
-write_xg0(SCSI *scgp,
+write_xg0(SCSI *usalp,
caddr_t bp /* address of buffer */,
long addr /* disk address (sector) to put */,
long size /* number of bytes to transfer */,
int cnt /* sectorcount */)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -636,25 +636,25 @@
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = SC_WRITE;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
g0_cdbaddr(&scmd->cdb.g0_cdb, addr);
scmd->cdb.g0_cdb.count = cnt;
- scgp->cmdname = "write_g0";
+ usalp->cmdname = "write_g0";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
- return (size - scg_getresid(scgp));
+ return (size - usal_getresid(usalp));
}
int
-write_xg1(SCSI *scgp,
+write_xg1(SCSI *usalp,
caddr_t bp /* address of buffer */,
long addr /* disk address (sector) to put */,
long size /* number of bytes to transfer */,
int cnt /* sectorcount */)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -664,25 +664,25 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = SC_EWRITE;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdbaddr(&scmd->cdb.g1_cdb, addr);
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "write_g1";
+ usalp->cmdname = "write_g1";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
- return (size - scg_getresid(scgp));
+ return (size - usal_getresid(usalp));
}
int
-write_xg5(SCSI *scgp,
+write_xg5(SCSI *usalp,
caddr_t bp /* address of buffer */,
long addr /* disk address (sector) to put */,
long size /* number of bytes to transfer */,
int cnt /* sectorcount */)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -692,66 +692,66 @@
scmd->cdb_len = SC_G5_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g5_cdb.cmd = 0xAA;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
g5_cdbaddr(&scmd->cdb.g5_cdb, addr);
g5_cdblen(&scmd->cdb.g5_cdb, cnt);
- scgp->cmdname = "write_g5";
+ usalp->cmdname = "write_g5";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
- return (size - scg_getresid(scgp));
+ return (size - usal_getresid(usalp));
}
int
-seek_scsi(SCSI *scgp, long addr)
+seek_scsi(SCSI *usalp, long addr)
{
if (addr <= G0_MAXADDR)
- return (seek_g0(scgp, addr));
+ return (seek_g0(usalp, addr));
else
- return (seek_g1(scgp, addr));
+ return (seek_g1(usalp, addr));
}
int
-seek_g0(SCSI *scgp, long addr)
+seek_g0(SCSI *usalp, long addr)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = 0x0B; /* Seek */
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
g0_cdbaddr(&scmd->cdb.g0_cdb, addr);
- scgp->cmdname = "seek_g0";
+ usalp->cmdname = "seek_g0";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
int
-seek_g1(SCSI *scgp, long addr)
+seek_g1(SCSI *usalp, long addr)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x2B; /* Seek G1 */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdbaddr(&scmd->cdb.g1_cdb, addr);
- scgp->cmdname = "seek_g1";
+ usalp->cmdname = "seek_g1";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
int
-scsi_flush_cache(SCSI *scgp, BOOL immed)
+scsi_flush_cache(SCSI *usalp, BOOL immed)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
@@ -759,22 +759,22 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->timeout = 2 * 60; /* Max: sizeof (CDR-cache)/150KB/s */
scmd->cdb.g1_cdb.cmd = 0x35;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
if (immed)
scmd->cdb.cmd_cdb[1] |= 0x02;
- scgp->cmdname = "flush cache";
+ usalp->cmdname = "flush cache";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-read_buffer(SCSI *scgp, caddr_t bp, int cnt, int mode)
+read_buffer(SCSI *usalp, caddr_t bp, int cnt, int mode)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -783,20 +783,20 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x3C; /* Read Buffer */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.cmd_cdb[1] |= (mode & 7);
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "read buffer";
+ usalp->cmdname = "read buffer";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
int
-write_buffer(SCSI *scgp, char *buffer, long length, int mode, int bufferid,
+write_buffer(SCSI *usalp, char *buffer, long length, int mode, int bufferid,
long offset)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
char *cdb;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
@@ -818,19 +818,19 @@
cdb[7] = (length >> 8) & 0xff;
cdb[8] = length & 0xff;
- scgp->cmdname = "write_buffer";
+ usalp->cmdname = "write_buffer";
- if (scg_cmd(scgp) >= 0)
+ if (usal_cmd(usalp) >= 0)
return (1);
return (0);
}
int
-read_subchannel(SCSI *scgp, caddr_t bp, int track, int cnt, int msf, int subq,
+read_subchannel(SCSI *usalp, caddr_t bp, int track, int cnt, int msf, int subq,
int fmt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -839,7 +839,7 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x42;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
if (msf)
scmd->cdb.g1_cdb.res = 1;
if (subq)
@@ -848,17 +848,17 @@
scmd->cdb.g1_cdb.res6 = track;
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "read subchannel";
+ usalp->cmdname = "read subchannel";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-read_toc(SCSI *scgp, caddr_t bp, int track, int cnt, int msf, int fmt)
+read_toc(SCSI *usalp, caddr_t bp, int track, int cnt, int msf, int fmt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -867,24 +867,24 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x43;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
if (msf)
scmd->cdb.g1_cdb.res = 1;
scmd->cdb.g1_cdb.addr[0] = fmt & 0x0F;
scmd->cdb.g1_cdb.res6 = track;
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "read toc";
+ usalp->cmdname = "read toc";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-read_toc_philips(SCSI *scgp, caddr_t bp, int track, int cnt, int msf, int fmt)
+read_toc_philips(SCSI *usalp, caddr_t bp, int track, int cnt, int msf, int fmt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -894,7 +894,7 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->timeout = 4 * 60; /* May last 174s on a TEAC CD-R55S */
scmd->cdb.g1_cdb.cmd = 0x43;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
if (msf)
scmd->cdb.g1_cdb.res = 1;
scmd->cdb.g1_cdb.res6 = track;
@@ -905,17 +905,17 @@
if (fmt & 2)
scmd->cdb.g1_cdb.vu_97 = 1;
- scgp->cmdname = "read toc";
+ usalp->cmdname = "read toc";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-read_header(SCSI *scgp, caddr_t bp, long addr, int cnt, int msf)
+read_header(SCSI *usalp, caddr_t bp, long addr, int cnt, int msf)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -924,23 +924,23 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x44;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
if (msf)
scmd->cdb.g1_cdb.res = 1;
g1_cdbaddr(&scmd->cdb.g1_cdb, addr);
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "read header";
+ usalp->cmdname = "read header";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-read_disk_info(SCSI *scgp, caddr_t bp, int cnt)
+read_disk_info(SCSI *usalp, caddr_t bp, int cnt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -950,20 +950,20 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->timeout = 4 * 60; /* Needs up to 2 minutes */
scmd->cdb.g1_cdb.cmd = 0x51;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "read disk info";
+ usalp->cmdname = "read disk info";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-read_track_info(SCSI *scgp, caddr_t bp, int type, int addr, int cnt)
+read_track_info(SCSI *usalp, caddr_t bp, int type, int addr, int cnt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -973,35 +973,35 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->timeout = 4 * 60; /* Needs up to 2 minutes */
scmd->cdb.g1_cdb.cmd = 0x52;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
/* scmd->cdb.cmd_cdb[1] = type & 0x03;*/
scmd->cdb.cmd_cdb[1] = type;
g1_cdbaddr(&scmd->cdb.g1_cdb, addr); /* LBA/Track/Session */
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "read track info";
+ usalp->cmdname = "read track info";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-reserve_track(SCSI *scgp, Ulong size)
+reserve_track(SCSI *usalp, Ulong size)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof(*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x53;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
i_to_4_byte(&scmd->cdb.g1_cdb.addr[3], size);
- scgp->cmdname = "reserve track";
+ usalp->cmdname = "reserve track";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
@@ -1009,15 +1009,15 @@
}
int
-read_rzone_info(SCSI *scgp, caddr_t bp, int cnt)
+read_rzone_info(SCSI *usalp, caddr_t bp, int cnt)
{
- return (read_track_info(scgp, bp, TI_TYPE_LBA, 0, cnt));
+ return (read_track_info(usalp, bp, TI_TYPE_LBA, 0, cnt));
}
int
-reserve_tr_rzone(SCSI *scgp, long size /* number of blocks */)
+reserve_tr_rzone(SCSI *usalp, long size /* number of blocks */)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)0;
@@ -1026,22 +1026,22 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x53;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
i_to_4_byte(&scmd->cdb.g1_cdb.addr[3], size);
- scgp->cmdname = "reserve_track_rzone";
+ usalp->cmdname = "reserve_track_rzone";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-read_dvd_structure(SCSI *scgp, caddr_t bp, int cnt, int addr, int layer,
+read_dvd_structure(SCSI *usalp, caddr_t bp, int cnt, int addr, int layer,
int fmt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -1051,23 +1051,23 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->timeout = 4 * 60; /* Needs up to 2 minutes ??? */
scmd->cdb.g5_cdb.cmd = 0xAD;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
g5_cdbaddr(&scmd->cdb.g5_cdb, addr);
g5_cdblen(&scmd->cdb.g5_cdb, cnt);
scmd->cdb.g5_cdb.count[0] = layer;
scmd->cdb.g5_cdb.count[1] = fmt;
- scgp->cmdname = "read dvd structure";
+ usalp->cmdname = "read dvd structure";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-send_dvd_structure(SCSI *scgp, caddr_t bp, int cnt, int layer, int fmt)
+send_dvd_structure(SCSI *usalp, caddr_t bp, int cnt, int layer, int fmt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -1077,22 +1077,22 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->timeout = 4 * 60; /* Needs up to 2 minutes ??? */
scmd->cdb.g5_cdb.cmd = 0xBF;
- scmd->cdb.g5_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g5_cdb.lun = usal_lun(usalp);
g5_cdblen(&scmd->cdb.g5_cdb, cnt);
scmd->cdb.cmd_cdb[7] = fmt;
- scgp->cmdname = "send dvd structure";
+ usalp->cmdname = "send dvd structure";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-send_opc(SCSI *scgp, caddr_t bp, int cnt, int doopc)
+send_opc(SCSI *usalp, caddr_t bp, int cnt, int doopc)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -1102,21 +1102,21 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->timeout = 60;
scmd->cdb.g1_cdb.cmd = 0x54;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.reladr = doopc?1:0;
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "send opc";
+ usalp->cmdname = "send opc";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-read_track_info_philips(SCSI *scgp, caddr_t bp, int track, int cnt)
+read_track_info_philips(SCSI *usalp, caddr_t bp, int track, int cnt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -1125,21 +1125,21 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0xE5;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdbaddr(&scmd->cdb.g1_cdb, track);
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "read track info";
+ usalp->cmdname = "read track info";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-scsi_close_tr_session(SCSI *scgp, int type, int track, BOOL immed)
+scsi_close_tr_session(SCSI *usalp, int type, int track, BOOL immed)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
@@ -1147,7 +1147,7 @@
scmd->sense_len = CCS_SENSE_LEN;
scmd->timeout = 8 * 60; /* Needs up to 4 minutes */
scmd->cdb.g1_cdb.cmd = 0x5B;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.addr[0] = type;
scmd->cdb.g1_cdb.addr[3] = track;
@@ -1158,17 +1158,17 @@
scmd->cdb.g1_cdb.reladr = 1; /* IMM hack to test Mitsumi behaviour*/
#endif
- scgp->cmdname = "close track/session";
+ usalp->cmdname = "close track/session";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-read_master_cue(SCSI *scgp, caddr_t bp, int sheet, int cnt)
+read_master_cue(SCSI *usalp, caddr_t bp, int sheet, int cnt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -1177,21 +1177,21 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x59; /* Read master cue */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g1_cdb.addr[2] = sheet;
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "read master cue";
+ usalp->cmdname = "read master cue";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (0);
}
int
-send_cue_sheet(SCSI *scgp, caddr_t bp, long size)
+send_cue_sheet(SCSI *usalp, caddr_t bp, long size)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -1200,24 +1200,24 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x5D; /* Send CUE sheet */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdblen(&scmd->cdb.g1_cdb, size);
- scgp->cmdname = "send_cue_sheet";
+ usalp->cmdname = "send_cue_sheet";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
return (size - scmd->resid);
}
int
-read_buff_cap(SCSI *scgp, long *sp, long *fp)
+read_buff_cap(SCSI *usalp, long *sp, long *fp)
{
char resp[12];
Ulong freespace;
Ulong bufsize;
int per;
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)resp;
@@ -1226,12 +1226,12 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x5C; /* Read buffer cap */
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdblen(&scmd->cdb.g1_cdb, sizeof (resp));
- scgp->cmdname = "read buffer cap";
+ usalp->cmdname = "read buffer cap";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
bufsize = a_to_u_4_byte(&resp[4]);
@@ -1241,7 +1241,7 @@
if (fp)
*fp = freespace;
- if (scgp->verbose || (sp == 0 && fp == 0))
+ if (usalp->verbose || (sp == 0 && fp == 0))
printf("BFree: %ld K BSize: %ld K\n", freespace >> 10, bufsize >> 10);
if (bufsize == 0)
@@ -1255,9 +1255,9 @@
}
int
-scsi_blank(SCSI *scgp, long addr, int blanktype, BOOL immed)
+scsi_blank(SCSI *usalp, long addr, int blanktype, BOOL immed)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->flags = SCG_DISRE_ENA;
@@ -1272,15 +1272,15 @@
scmd->cdb.g5_cdb.res |= 8;
/* scmd->cdb.cmd_cdb[1] |= 0x10;*/
- scgp->cmdname = "blank unit";
+ usalp->cmdname = "blank unit";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
int
-scsi_format(SCSI *scgp, caddr_t addr, int size, BOOL background)
+scsi_format(SCSI *usalp, caddr_t addr, int size, BOOL background)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
int progress=0, ret=-1, pid=-1;
unsigned char sense_table[18];
int i;
@@ -1298,10 +1298,10 @@
scmd->cdb.cmd_cdb[1] = 0x11; /* "FmtData" and "Format Code" */
scmd->cdb.cmd_cdb[5] = 0;
- scgp->cmdname = "format unit";
+ usalp->cmdname = "format unit";
printf("scsi_format: running\n");
- ret = (scg_cmd(scgp));
+ ret = (usal_cmd(usalp));
printf("scsi_format: post processing %d\n", ret);
if (ret == -1) return ret;
if (background) {
@@ -1310,7 +1310,7 @@
else {
if (!pid) {
while (1) {
- if (test_unit_ready(scgp) >= 0)
+ if (test_unit_ready(usalp) >= 0)
break;
sleep(1);
}
@@ -1322,8 +1322,8 @@
sleep(20);
i = 0;
while (progress < 0xfff0 && !(progress == 0 && i > 50)) {
- test_unit_ready(scgp);
- request_sense_b(scgp, (caddr_t)sense_table, 18);
+ test_unit_ready(usalp);
+ request_sense_b(usalp, (caddr_t)sense_table, 18);
progress = sense_table[16]<<8|sense_table[17];
printf("\rFormating in progress: %.2f %% done [%d]. ", (float)(progress*100)/0x10000,progress);
usleep(100000);
@@ -1346,7 +1346,7 @@
static BOOL is_atapi;
BOOL
-allow_atapi(SCSI *scgp, BOOL new)
+allow_atapi(SCSI *usalp, BOOL new)
{
BOOL old = is_atapi;
Uchar mode[256];
@@ -1354,43 +1354,43 @@
if (new == old)
return (old);
- scgp->silent++;
+ usalp->silent++;
/*
* If a bad drive has been reset before, we may need to fire up two
* test unit ready commands to clear status.
*/
- (void) unit_ready(scgp);
+ (void) unit_ready(usalp);
if (new &&
- mode_sense_g1(scgp, mode, 8, 0x3F, 0) < 0) { /* All pages current */
+ mode_sense_g1(usalp, mode, 8, 0x3F, 0) < 0) { /* All pages current */
new = FALSE;
}
- scgp->silent--;
+ usalp->silent--;
is_atapi = new;
return (old);
}
int
-mode_select(SCSI *scgp, Uchar *dp, int cnt, int smp, int pf)
+mode_select(SCSI *usalp, Uchar *dp, int cnt, int smp, int pf)
{
if (is_atapi)
- return (mode_select_sg0(scgp, dp, cnt, smp, pf));
- return (mode_select_g0(scgp, dp, cnt, smp, pf));
+ return (mode_select_sg0(usalp, dp, cnt, smp, pf));
+ return (mode_select_g0(usalp, dp, cnt, smp, pf));
}
int
-mode_sense(SCSI *scgp, Uchar *dp, int cnt, int page, int pcf)
+mode_sense(SCSI *usalp, Uchar *dp, int cnt, int page, int pcf)
{
if (is_atapi)
- return (mode_sense_sg0(scgp, dp, cnt, page, pcf));
- return (mode_sense_g0(scgp, dp, cnt, page, pcf));
+ return (mode_sense_sg0(usalp, dp, cnt, page, pcf));
+ return (mode_sense_g0(usalp, dp, cnt, page, pcf));
}
/*
* Simulate mode select g0 with mode select g1.
*/
int
-mode_select_sg0(SCSI *scgp, Uchar *dp, int cnt, int smp, int pf)
+mode_select_sg0(SCSI *usalp, Uchar *dp, int cnt, int smp, int pf)
{
Uchar xmode[256+4];
int amt = cnt;
@@ -1414,16 +1414,16 @@
xmode[5] = 0;
i_to_2_byte(&xmode[6], (unsigned int)dp[3]);
- if (scgp->verbose) scg_prbytes("Mode Parameters (un-converted)", dp, cnt);
+ if (usalp->verbose) usal_prbytes("Mode Parameters (un-converted)", dp, cnt);
- return (mode_select_g1(scgp, xmode, amt, smp, pf));
+ return (mode_select_g1(usalp, xmode, amt, smp, pf));
}
/*
* Simulate mode sense g0 with mode sense g1.
*/
int
-mode_sense_sg0(SCSI *scgp, Uchar *dp, int cnt, int page, int pcf)
+mode_sense_sg0(SCSI *usalp, Uchar *dp, int cnt, int page, int pcf)
{
Uchar xmode[256+4];
int amt = cnt;
@@ -1440,10 +1440,10 @@
} else {
amt += 4;
}
- if (mode_sense_g1(scgp, xmode, amt, page, pcf) < 0)
+ if (mode_sense_g1(usalp, xmode, amt, page, pcf) < 0)
return (-1);
- amt = cnt - scg_getresid(scgp);
+ amt = cnt - usal_getresid(usalp);
/*
* For tests: Solaris 8 & LG CD-ROM always returns resid == amt
*/
@@ -1465,14 +1465,14 @@
len = a_to_u_2_byte(&xmode[6]);
dp[3] = len;
- if (scgp->verbose) scg_prbytes("Mode Sense Data (converted)", dp, amt);
+ if (usalp->verbose) usal_prbytes("Mode Sense Data (converted)", dp, amt);
return (0);
}
int
-mode_select_g0(SCSI *scgp, Uchar *dp, int cnt, int smp, int pf)
+mode_select_g0(SCSI *usalp, Uchar *dp, int cnt, int smp, int pf)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)dp;
@@ -1481,24 +1481,24 @@
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = SC_MODE_SELECT;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
scmd->cdb.g0_cdb.high_addr = smp ? 1 : 0 | pf ? 0x10 : 0;
scmd->cdb.g0_cdb.count = cnt;
- if (scgp->verbose) {
+ if (usalp->verbose) {
fprintf(stderr, "%s ", smp?"Save":"Set ");
- scg_prbytes("Mode Parameters", dp, cnt);
+ usal_prbytes("Mode Parameters", dp, cnt);
}
- scgp->cmdname = "mode select g0";
+ usalp->cmdname = "mode select g0";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
int
-mode_select_g1(SCSI *scgp, Uchar *dp, int cnt, int smp, int pf)
+mode_select_g1(SCSI *usalp, Uchar *dp, int cnt, int smp, int pf)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)dp;
@@ -1507,24 +1507,24 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x55;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
scmd->cdb.g0_cdb.high_addr = smp ? 1 : 0 | pf ? 0x10 : 0;
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- if (scgp->verbose) {
+ if (usalp->verbose) {
printf("%s ", smp?"Save":"Set ");
- scg_prbytes("Mode Parameters", dp, cnt);
+ usal_prbytes("Mode Parameters", dp, cnt);
}
- scgp->cmdname = "mode select g1";
+ usalp->cmdname = "mode select g1";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
int
-mode_sense_g0(SCSI *scgp, Uchar *dp, int cnt, int page, int pcf)
+mode_sense_g0(SCSI *usalp, Uchar *dp, int cnt, int page, int pcf)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)dp;
@@ -1534,7 +1534,7 @@
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = SC_MODE_SENSE;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
#ifdef nonono
scmd->cdb.g0_cdb.high_addr = 1<<4; /* DBD Disable Block desc. */
#endif
@@ -1542,18 +1542,18 @@
scmd->cdb.g0_cdb.count = page ? 0xFF : 24;
scmd->cdb.g0_cdb.count = cnt;
- scgp->cmdname = "mode sense g0";
+ usalp->cmdname = "mode sense g0";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
- if (scgp->verbose) scg_prbytes("Mode Sense Data", dp, cnt - scg_getresid(scgp));
+ if (usalp->verbose) usal_prbytes("Mode Sense Data", dp, cnt - usal_getresid(usalp));
return (0);
}
int
-mode_sense_g1(SCSI *scgp, Uchar *dp, int cnt, int page, int pcf)
+mode_sense_g1(SCSI *usalp, Uchar *dp, int cnt, int page, int pcf)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = (caddr_t)dp;
@@ -1562,18 +1562,18 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x5A;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
#ifdef nonono
scmd->cdb.g0_cdb.high_addr = 1<<4; /* DBD Disable Block desc. */
#endif
scmd->cdb.g1_cdb.addr[0] = (page&0x3F) | ((pcf<<6)&0xC0);
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "mode sense g1";
+ usalp->cmdname = "mode sense g1";
- if (scg_cmd(scgp) < 0)
+ if (usal_cmd(usalp) < 0)
return (-1);
- if (scgp->verbose) scg_prbytes("Mode Sense Data", dp, cnt - scg_getresid(scgp));
+ if (usalp->verbose) usal_prbytes("Mode Sense Data", dp, cnt - usal_getresid(usalp));
return (0);
}
@@ -1628,7 +1628,7 @@
int
-read_tochdr(SCSI *scgp, cdr_t *dp, int *fp, int *lp)
+read_tochdr(SCSI *usalp, cdr_t *dp, int *fp, int *lp)
{
struct tocheader *tp;
char xb[256];
@@ -1637,8 +1637,8 @@
tp = (struct tocheader *)xb;
fillbytes((caddr_t)xb, sizeof (xb), '\0');
- if (read_toc(scgp, xb, 0, sizeof (struct tocheader), 0, FMT_TOC) < 0) {
- if (scgp->silent == 0)
+ if (read_toc(usalp, xb, 0, sizeof (struct tocheader), 0, FMT_TOC) < 0) {
+ if (usalp->silent == 0)
errmsgno(EX_BAD, "Cannot read TOC header\n");
return (-1);
}
@@ -1654,7 +1654,7 @@
}
int
-read_cdtext(SCSI *scgp)
+read_cdtext(SCSI *usalp)
{
struct tocheader *tp;
char xb[256];
@@ -1664,16 +1664,16 @@
tp = (struct tocheader *)xb;
fillbytes((caddr_t)xb, sizeof (xb), '\0');
- if (read_toc(scgp, xb, 0, sizeof (struct tocheader), 0, FMT_CDTEXT) < 0) {
- if (scgp->silent == 0 || scgp->verbose > 0)
+ if (read_toc(usalp, xb, 0, sizeof (struct tocheader), 0, FMT_CDTEXT) < 0) {
+ if (usalp->silent == 0 || usalp->verbose > 0)
errmsgno(EX_BAD, "Cannot read CD-Text header\n");
return (-1);
}
len = a_to_u_2_byte(tp->len) + sizeof (struct tocheader)-2;
printf("CD-Text len: %d\n", len);
- if (read_toc(scgp, xxb, 0, len, 0, FMT_CDTEXT) < 0) {
- if (scgp->silent == 0)
+ if (read_toc(usalp, xxb, 0, len, 0, FMT_CDTEXT) < 0) {
+ if (usalp->silent == 0)
errmsgno(EX_BAD, "Cannot read CD-Text\n");
return (-1);
}
@@ -1685,7 +1685,7 @@
}
int
-read_trackinfo(SCSI *scgp, int track, long *offp, struct msf *msfp, int *adrp,
+read_trackinfo(SCSI *usalp, int track, long *offp, struct msf *msfp, int *adrp,
int *controlp, int *modep)
{
struct diskinfo *dp;
@@ -1695,8 +1695,8 @@
dp = (struct diskinfo *)xb;
fillbytes((caddr_t)xb, sizeof (xb), '\0');
- if (read_toc(scgp, xb, track, sizeof (struct diskinfo), 0, FMT_TOC) < 0) {
- if (scgp->silent <= 0)
+ if (read_toc(usalp, xb, track, sizeof (struct diskinfo), 0, FMT_TOC) < 0) {
+ if (usalp->silent <= 0)
errmsgno(EX_BAD, "Cannot read TOC\n");
return (-1);
}
@@ -1712,13 +1712,13 @@
*controlp = dp->desc[0].control;
if (msfp) {
- scgp->silent++;
- if (read_toc(scgp, xb, track, sizeof (struct diskinfo), 1, FMT_TOC)
+ usalp->silent++;
+ if (read_toc(usalp, xb, track, sizeof (struct diskinfo), 1, FMT_TOC)
>= 0) {
msfp->msf_min = dp->desc[0].addr[1];
msfp->msf_sec = dp->desc[0].addr[2];
msfp->msf_frame = dp->desc[0].addr[3];
- } else if (read_toc(scgp, xb, track, sizeof (struct diskinfo), 0, FMT_TOC)
+ } else if (read_toc(usalp, xb, track, sizeof (struct diskinfo), 0, FMT_TOC)
>= 0) {
/*
* Some drives (e.g. the Philips CDD-522) don't support
@@ -1732,7 +1732,7 @@
msfp->msf_sec = 0;
msfp->msf_frame = 0;
}
- scgp->silent--;
+ usalp->silent--;
}
if (modep == NULL)
@@ -1745,20 +1745,20 @@
fillbytes((caddr_t)xb, sizeof (xb), '\0');
- scgp->silent++;
- if (read_header(scgp, xb, *offp, 8, 0) >= 0) {
+ usalp->silent++;
+ if (read_header(usalp, xb, *offp, 8, 0) >= 0) {
*modep = xb[0];
- } else if (read_track_info_philips(scgp, xb, track, 14) >= 0) {
+ } else if (read_track_info_philips(usalp, xb, track, 14) >= 0) {
*modep = xb[0xb] & 0xF;
} else {
*modep = -1;
}
- scgp->silent--;
+ usalp->silent--;
return (0);
}
int
-read_B0(SCSI *scgp, BOOL isbcd, long *b0p, long *lop)
+read_B0(SCSI *usalp, BOOL isbcd, long *b0p, long *lop)
{
struct fdiskinfo *dp;
struct ftrackdesc *tp;
@@ -1770,25 +1770,25 @@
dp = (struct fdiskinfo *)xb;
fillbytes((caddr_t)xb, sizeof (xb), '\0');
- if (read_toc_philips(scgp, xb, 1, sizeof (struct tocheader), 0, FMT_FULLTOC) < 0) {
+ if (read_toc_philips(usalp, xb, 1, sizeof (struct tocheader), 0, FMT_FULLTOC) < 0) {
return (-1);
}
len = a_to_u_2_byte(dp->hd.len) + sizeof (struct tocheader)-2;
if (len < (int)sizeof (struct fdiskinfo))
return (-1);
- if (read_toc_philips(scgp, xb, 1, len, 0, FMT_FULLTOC) < 0) {
+ if (read_toc_philips(usalp, xb, 1, len, 0, FMT_FULLTOC) < 0) {
return (-1);
}
- if (scgp->verbose) {
- scg_prbytes("TOC data: ", (Uchar *)xb,
- len > (int)sizeof (xb) - scg_getresid(scgp) ?
- sizeof (xb) - scg_getresid(scgp) : len);
+ if (usalp->verbose) {
+ usal_prbytes("TOC data: ", (Uchar *)xb,
+ len > (int)sizeof (xb) - usal_getresid(usalp) ?
+ sizeof (xb) - usal_getresid(usalp) : len);
tp = &dp->desc[0];
pe = &xb[len];
while ((char *)tp < pe) {
- scg_prbytes("ENT: ", (Uchar *)tp, 11);
+ usal_prbytes("ENT: ", (Uchar *)tp, 11);
tp++;
}
}
@@ -1800,8 +1800,8 @@
continue;
if (tp->point != 0xB0)
continue;
- if (scgp->verbose)
- scg_prbytes("B0: ", (Uchar *)tp, 11);
+ if (usalp->verbose)
+ usal_prbytes("B0: ", (Uchar *)tp, 11);
if (isbcd) {
l = msf_to_lba(from_bcd(tp->amin),
from_bcd(tp->asec),
@@ -1814,7 +1814,7 @@
if (b0p)
*b0p = l;
- if (scgp->verbose)
+ if (usalp->verbose)
printf("B0 start: %ld\n", l);
if (isbcd) {
@@ -1827,7 +1827,7 @@
tp->pframe, TRUE);
}
- if (scgp->verbose)
+ if (usalp->verbose)
printf("B0 lout: %ld\n", l);
if (lop)
*lop = l;
@@ -1841,7 +1841,7 @@
* Return address of first track in last session (SCSI-3/mmc version).
*/
int
-read_session_offset(SCSI *scgp, long *offp)
+read_session_offset(SCSI *usalp, long *offp)
{
struct diskinfo *dp;
char xb[256];
@@ -1850,24 +1850,24 @@
dp = (struct diskinfo *)xb;
fillbytes((caddr_t)xb, sizeof (xb), '\0');
- if (read_toc(scgp, (caddr_t)xb, 0, sizeof (struct tocheader), 0, FMT_SINFO) < 0)
+ if (read_toc(usalp, (caddr_t)xb, 0, sizeof (struct tocheader), 0, FMT_SINFO) < 0)
return (-1);
- if (scgp->verbose)
- scg_prbytes("tocheader: ",
- (Uchar *)xb, sizeof (struct tocheader) - scg_getresid(scgp));
+ if (usalp->verbose)
+ usal_prbytes("tocheader: ",
+ (Uchar *)xb, sizeof (struct tocheader) - usal_getresid(usalp));
len = a_to_u_2_byte(dp->hd.len) + sizeof (struct tocheader)-2;
if (len > (int)sizeof (xb)) {
errmsgno(EX_BAD, "Session info too big.\n");
return (-1);
}
- if (read_toc(scgp, (caddr_t)xb, 0, len, 0, FMT_SINFO) < 0)
+ if (read_toc(usalp, (caddr_t)xb, 0, len, 0, FMT_SINFO) < 0)
return (-1);
- if (scgp->verbose)
- scg_prbytes("tocheader: ",
- (Uchar *)xb, len - scg_getresid(scgp));
+ if (usalp->verbose)
+ usal_prbytes("tocheader: ",
+ (Uchar *)xb, len - usal_getresid(usalp));
dp = (struct diskinfo *)xb;
if (offp)
@@ -1879,7 +1879,7 @@
* Return address of first track in last session (pre SCSI-3 version).
*/
int
-read_session_offset_philips(SCSI *scgp, long *offp)
+read_session_offset_philips(SCSI *usalp, long *offp)
{
struct sinfo *sp;
char xb[256];
@@ -1888,14 +1888,14 @@
sp = (struct sinfo *)xb;
fillbytes((caddr_t)xb, sizeof (xb), '\0');
- if (read_toc_philips(scgp, (caddr_t)xb, 0, sizeof (struct siheader), 0, FMT_SINFO) < 0)
+ if (read_toc_philips(usalp, (caddr_t)xb, 0, sizeof (struct siheader), 0, FMT_SINFO) < 0)
return (-1);
len = a_to_u_2_byte(sp->hd.len) + sizeof (struct siheader)-2;
if (len > (int)sizeof (xb)) {
errmsgno(EX_BAD, "Session info too big.\n");
return (-1);
}
- if (read_toc_philips(scgp, (caddr_t)xb, 0, len, 0, FMT_SINFO) < 0)
+ if (read_toc_philips(usalp, (caddr_t)xb, 0, len, 0, FMT_SINFO) < 0)
return (-1);
/*
* Old drives return the number of finished sessions in first/finished
@@ -1912,7 +1912,7 @@
}
int
-sense_secsize(SCSI *scgp, int current)
+sense_secsize(SCSI *usalp, int current)
{
Uchar mode[0x100];
Uchar *p;
@@ -1920,14 +1920,14 @@
int len;
int secsize = -1;
- scgp->silent++;
- (void) unit_ready(scgp);
- scgp->silent--;
+ usalp->silent++;
+ (void) unit_ready(usalp);
+ usalp->silent--;
/* XXX Quick and dirty, musz verallgemeinert werden !!! */
fillbytes(mode, sizeof (mode), '\0');
- scgp->silent++;
+ usalp->silent++;
len = sizeof (struct scsi_mode_header) +
sizeof (struct scsi_mode_blockdesc);
@@ -1935,15 +1935,15 @@
* Wenn wir hier get_mode_params() nehmen bekommen wir die Warnung:
* Warning: controller returns wrong page 1 for All pages page (3F).
*/
- if (mode_sense(scgp, mode, len, 0x3F, current?0:2) < 0) {
+ if (mode_sense(usalp, mode, len, 0x3F, current?0:2) < 0) {
fillbytes(mode, sizeof (mode), '\0');
- if (mode_sense(scgp, mode, len, 0, current?0:2) < 0) { /* VU (block desc) */
- scgp->silent--;
+ if (mode_sense(usalp, mode, len, 0, current?0:2) < 0) { /* VU (block desc) */
+ usalp->silent--;
return (-1);
}
}
if (mode[3] == 8) {
- if (scgp->debug) {
+ if (usalp->debug) {
printf("Density: 0x%X\n", mode[4]);
printf("Blocks: %ld\n", a_to_u_3_byte(&mode[5]));
printf("Blocklen:%ld\n", a_to_u_3_byte(&mode[9]));
@@ -1957,8 +1957,8 @@
* mode_sense of all pages. So try to avoid to run this
* command if possible.
*/
- if (scgp->debug &&
- mode_sense(scgp, mode, 0xFE, 0x3F, current?0:2) >= 0) { /* All Pages */
+ if (usalp->debug &&
+ mode_sense(usalp, mode, 0xFE, 0x3F, current?0:2) >= 0) { /* All Pages */
ep = mode+mode[0]; /* Points to last byte of data */
p = &mode[4];
@@ -1970,37 +1970,37 @@
}
printf("\n");
}
- scgp->silent--;
+ usalp->silent--;
return (secsize);
}
int
-select_secsize(SCSI *scgp, int secsize)
+select_secsize(SCSI *usalp, int secsize)
{
struct scsi_mode_data md;
int count = sizeof (struct scsi_mode_header) +
sizeof (struct scsi_mode_blockdesc);
- (void) test_unit_ready(scgp); /* clear any error situation */
+ (void) test_unit_ready(usalp); /* clear any error situation */
fillbytes((caddr_t)&md, sizeof (md), '\0');
md.header.blockdesc_len = 8;
i_to_3_byte(md.blockdesc.lblen, secsize);
- return (mode_select(scgp, (Uchar *)&md, count, 0, scgp->inq->data_format >= 2));
+ return (mode_select(usalp, (Uchar *)&md, count, 0, usalp->inq->data_format >= 2));
}
BOOL
-is_cddrive(SCSI *scgp)
+is_cddrive(SCSI *usalp)
{
- return (scgp->inq->type == INQ_ROMD || scgp->inq->type == INQ_WORM);
+ return (usalp->inq->type == INQ_ROMD || usalp->inq->type == INQ_WORM);
}
BOOL
-is_unknown_dev(SCSI *scgp)
+is_unknown_dev(SCSI *usalp)
{
- return (scgp->dev == DEV_UNKNOWN);
+ return (usalp->dev == DEV_UNKNOWN);
}
#ifndef DEBUG
@@ -2009,96 +2009,96 @@
#ifdef DEBUG
int
-read_scsi(SCSI *scgp, caddr_t bp, long addr, int cnt)
+read_scsi(SCSI *usalp, caddr_t bp, long addr, int cnt)
{
if (addr <= G0_MAXADDR && cnt < 256 && !is_atapi)
- return (read_g0(scgp, bp, addr, cnt));
+ return (read_g0(usalp, bp, addr, cnt));
else
- return (read_g1(scgp, bp, addr, cnt));
+ return (read_g1(usalp, bp, addr, cnt));
}
int
-read_g0(SCSI *scgp, caddr_t bp, long addr, int cnt)
+read_g0(SCSI *usalp, caddr_t bp, long addr, int cnt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
- if (scgp->cap->c_bsize <= 0)
+ if (usalp->cap->c_bsize <= 0)
raisecond("capacity_not_set", 0L);
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
- scmd->size = cnt*scgp->cap->c_bsize;
+ scmd->size = cnt*usalp->cap->c_bsize;
scmd->flags = SCG_RECV_DATA|SCG_DISRE_ENA;
scmd->cdb_len = SC_G0_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g0_cdb.cmd = SC_READ;
- scmd->cdb.g0_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g0_cdb.lun = usal_lun(usalp);
g0_cdbaddr(&scmd->cdb.g0_cdb, addr);
scmd->cdb.g0_cdb.count = cnt;
/* scmd->cdb.g0_cdb.vu_56 = 1;*/
- scgp->cmdname = "read_g0";
+ usalp->cmdname = "read_g0";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
int
-read_g1(SCSI *scgp, caddr_t bp, long addr, int cnt)
+read_g1(SCSI *usalp, caddr_t bp, long addr, int cnt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
- if (scgp->cap->c_bsize <= 0)
+ if (usalp->cap->c_bsize <= 0)
raisecond("capacity_not_set", 0L);
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
- scmd->size = cnt*scgp->cap->c_bsize;
+ scmd->size = cnt*usalp->cap->c_bsize;
scmd->flags = SCG_RECV_DATA|SCG_DISRE_ENA;
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = SC_EREAD;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
g1_cdbaddr(&scmd->cdb.g1_cdb, addr);
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "read_g1";
+ usalp->cmdname = "read_g1";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
#endif /* DEBUG */
BOOL
-getdev(SCSI *scgp, BOOL print)
+getdev(SCSI *usalp, BOOL print)
{
BOOL got_inquiry = TRUE;
char vendor_info[8+1];
char prod_ident[16+1];
char prod_revision[4+1];
int inq_len = 0;
- register struct scg_cmd *scmd = scgp->scmd;
- register struct scsi_inquiry *inq = scgp->inq;
+ register struct usal_cmd *scmd = usalp->scmd;
+ register struct scsi_inquiry *inq = usalp->inq;
fillbytes((caddr_t)inq, sizeof (*inq), '\0');
- scgp->dev = DEV_UNKNOWN;
- scgp->silent++;
- (void) unit_ready(scgp);
+ usalp->dev = DEV_UNKNOWN;
+ usalp->silent++;
+ (void) unit_ready(usalp);
if (scmd->error >= SCG_FATAL &&
!(scmd->scb.chk && scmd->sense_count > 0)) {
- scgp->silent--;
+ usalp->silent--;
return (FALSE);
}
/* if (scmd->error < SCG_FATAL || scmd->scb.chk && scmd->sense_count > 0){*/
- if (inquiry(scgp, (caddr_t)inq, sizeof (*inq)) < 0) {
+ if (inquiry(usalp, (caddr_t)inq, sizeof (*inq)) < 0) {
got_inquiry = FALSE;
} else {
- inq_len = sizeof (*inq) - scg_getresid(scgp);
+ inq_len = sizeof (*inq) - usal_getresid(usalp);
}
if (!got_inquiry) {
- if (scgp->verbose) {
+ if (usalp->verbose) {
printf(
"error: %d scb.chk: %d sense_count: %d sense.code: 0x%x\n",
scmd->error, scmd->scb.chk,
@@ -2118,17 +2118,17 @@
if (scmd->scb.chk && scmd->sense_count == 4) {
/* Test auf SYSGEN */
- (void) qic02(scgp, 0x12); /* soft lock on */
- if (qic02(scgp, 1) < 0) { /* soft lock off */
- scgp->dev = DEV_ACB40X0;
-/* scgp->dev = acbdev();*/
+ (void) qic02(usalp, 0x12); /* soft lock on */
+ if (qic02(usalp, 1) < 0) { /* soft lock off */
+ usalp->dev = DEV_ACB40X0;
+/* usalp->dev = acbdev();*/
} else {
- scgp->dev = DEV_SC4000;
+ usalp->dev = DEV_SC4000;
inq->type = INQ_SEQD;
inq->removable = 1;
}
}
- } else if (scgp->verbose) {
+ } else if (usalp->verbose) {
int i;
int len = inq->add_len + 5;
Uchar ibuf[256+5];
@@ -2136,8 +2136,8 @@
Uchar c;
if (len > (int)sizeof (*inq) &&
- inquiry(scgp, (caddr_t)ibuf, inq->add_len+5) >= 0) {
- len = inq->add_len+5 - scg_getresid(scgp);
+ inquiry(usalp, (caddr_t)ibuf, inq->add_len+5) >= 0) {
+ len = inq->add_len+5 - usal_getresid(usalp);
ip = ibuf;
} else {
len = sizeof (*inq);
@@ -2185,12 +2185,12 @@
}
}
if (inq->add_len == 0) {
- if (scgp->dev == DEV_UNKNOWN && got_inquiry) {
- scgp->dev = DEV_ACB5500;
+ if (usalp->dev == DEV_UNKNOWN && got_inquiry) {
+ usalp->dev = DEV_ACB5500;
strcpy(inq->vendor_info,
"ADAPTEC ACB-5500 FAKE");
- } else switch (scgp->dev) {
+ } else switch (usalp->dev) {
case DEV_ACB40X0:
strcpy(inq->vendor_info,
@@ -2210,38 +2210,38 @@
break;
}
} else if (inq->add_len < 31) {
- scgp->dev = DEV_NON_CCS_DSK;
+ usalp->dev = DEV_NON_CCS_DSK;
} else if (strbeg("EMULEX", vendor_info)) {
if (strbeg("MD21", prod_ident))
- scgp->dev = DEV_MD21;
+ usalp->dev = DEV_MD21;
if (strbeg("MD23", prod_ident))
- scgp->dev = DEV_MD23;
+ usalp->dev = DEV_MD23;
else
- scgp->dev = DEV_CCS_GENDISK;
+ usalp->dev = DEV_CCS_GENDISK;
} else if (strbeg("ADAPTEC", vendor_info)) {
if (strbeg("ACB-4520", prod_ident))
- scgp->dev = DEV_ACB4520A;
+ usalp->dev = DEV_ACB4520A;
if (strbeg("ACB-4525", prod_ident))
- scgp->dev = DEV_ACB4525;
+ usalp->dev = DEV_ACB4525;
else
- scgp->dev = DEV_CCS_GENDISK;
+ usalp->dev = DEV_CCS_GENDISK;
} else if (strbeg("SONY", vendor_info) &&
strbeg("SMO-C501", prod_ident)) {
- scgp->dev = DEV_SONY_SMO;
+ usalp->dev = DEV_SONY_SMO;
} else {
- scgp->dev = DEV_CCS_GENDISK;
+ usalp->dev = DEV_CCS_GENDISK;
}
break;
case INQ_SEQD:
- if (scgp->dev == DEV_SC4000) {
+ if (usalp->dev == DEV_SC4000) {
strcpy(inq->vendor_info,
"SYSGEN SC4000 FAKE");
} else if (inq->add_len == 0 &&
inq->removable &&
inq->ansi_version == 1) {
- scgp->dev = DEV_MT02;
+ usalp->dev = DEV_MT02;
strcpy(inq->vendor_info,
"EMULEX MT02 FAKE");
}
@@ -2251,48 +2251,48 @@
case INQ_ROMD:
case INQ_WORM:
if (strbeg("RXT-800S", prod_ident))
- scgp->dev = DEV_RXT800S;
+ usalp->dev = DEV_RXT800S;
/*
* Start of CD-Recorders:
*/
if (strbeg("ACER", vendor_info)) {
if (strbeg("CR-4020C", prod_ident))
- scgp->dev = DEV_RICOH_RO_1420C;
+ usalp->dev = DEV_RICOH_RO_1420C;
} else if (strbeg("CREATIVE", vendor_info)) {
if (strbeg("CDR2000", prod_ident))
- scgp->dev = DEV_RICOH_RO_1060C;
+ usalp->dev = DEV_RICOH_RO_1060C;
} else if (strbeg("GRUNDIG", vendor_info)) {
if (strbeg("CDR100IPW", prod_ident))
- scgp->dev = DEV_CDD_2000;
+ usalp->dev = DEV_CDD_2000;
} else if (strbeg("JVC", vendor_info)) {
if (strbeg("XR-W2001", prod_ident))
- scgp->dev = DEV_TEAC_CD_R50S;
+ usalp->dev = DEV_TEAC_CD_R50S;
else if (strbeg("XR-W2010", prod_ident))
- scgp->dev = DEV_TEAC_CD_R50S;
+ usalp->dev = DEV_TEAC_CD_R50S;
else if (strbeg("R2626", prod_ident))
- scgp->dev = DEV_TEAC_CD_R50S;
+ usalp->dev = DEV_TEAC_CD_R50S;
} else if (strbeg("MITSBISH", vendor_info)) {
#ifdef XXXX_REALLY
/* It's MMC compliant */
if (strbeg("CDRW226", prod_ident))
- scgp->dev = DEV_MMC_CDRW;
+ usalp->dev = DEV_MMC_CDRW;
#else
/* EMPTY */
#endif
} else if (strbeg("MITSUMI", vendor_info)) {
/* Don't know any product string */
- scgp->dev = DEV_CDD_522;
+ usalp->dev = DEV_CDD_522;
} else if (strbeg("OPTIMA", vendor_info)) {
if (strbeg("CD-R 650", prod_ident))
- scgp->dev = DEV_SONY_CDU_924;
+ usalp->dev = DEV_SONY_CDU_924;
} else if (strbeg("PHILIPS", vendor_info) ||
strbeg("IMS", vendor_info) ||
@@ -2300,126 +2300,126 @@
strbeg("HP", vendor_info)) {
if (strbeg("CDD521/00", prod_ident))
- scgp->dev = DEV_CDD_521_OLD;
+ usalp->dev = DEV_CDD_521_OLD;
else if (strbeg("CDD521/02", prod_ident))
- scgp->dev = DEV_CDD_521_OLD; /* PCD 200R? */
+ usalp->dev = DEV_CDD_521_OLD; /* PCD 200R? */
else if (strbeg("CDD521", prod_ident))
- scgp->dev = DEV_CDD_521;
+ usalp->dev = DEV_CDD_521;
if (strbeg("CDD522", prod_ident))
- scgp->dev = DEV_CDD_522;
+ usalp->dev = DEV_CDD_522;
if (strbeg("PCD225", prod_ident))
- scgp->dev = DEV_CDD_522;
+ usalp->dev = DEV_CDD_522;
if (strbeg("KHSW/OB", prod_ident)) /* PCD600 */
- scgp->dev = DEV_PCD_600;
+ usalp->dev = DEV_PCD_600;
if (strbeg("CDR-240", prod_ident))
- scgp->dev = DEV_CDD_2000;
+ usalp->dev = DEV_CDD_2000;
if (strbeg("CDD20", prod_ident))
- scgp->dev = DEV_CDD_2000;
+ usalp->dev = DEV_CDD_2000;
if (strbeg("CDD26", prod_ident))
- scgp->dev = DEV_CDD_2600;
+ usalp->dev = DEV_CDD_2600;
if (strbeg("C4324/C4325", prod_ident))
- scgp->dev = DEV_CDD_2000;
+ usalp->dev = DEV_CDD_2000;
if (strbeg("CD-Writer 6020", prod_ident))
- scgp->dev = DEV_CDD_2600;
+ usalp->dev = DEV_CDD_2600;
} else if (strbeg("PINNACLE", vendor_info)) {
if (strbeg("RCD-1000", prod_ident))
- scgp->dev = DEV_TEAC_CD_R50S;
+ usalp->dev = DEV_TEAC_CD_R50S;
if (strbeg("RCD5020", prod_ident))
- scgp->dev = DEV_TEAC_CD_R50S;
+ usalp->dev = DEV_TEAC_CD_R50S;
if (strbeg("RCD5040", prod_ident))
- scgp->dev = DEV_TEAC_CD_R50S;
+ usalp->dev = DEV_TEAC_CD_R50S;
if (strbeg("RCD 4X4", prod_ident))
- scgp->dev = DEV_TEAC_CD_R50S;
+ usalp->dev = DEV_TEAC_CD_R50S;
} else if (strbeg("PIONEER", vendor_info)) {
if (strbeg("CD-WO DW-S114X", prod_ident))
- scgp->dev = DEV_PIONEER_DW_S114X;
+ usalp->dev = DEV_PIONEER_DW_S114X;
else if (strbeg("CD-WO DR-R504X", prod_ident)) /* Reoprt from philip at merge.com */
- scgp->dev = DEV_PIONEER_DW_S114X;
+ usalp->dev = DEV_PIONEER_DW_S114X;
else if (strbeg("DVD-R DVR-S101", prod_ident))
- scgp->dev = DEV_PIONEER_DVDR_S101;
+ usalp->dev = DEV_PIONEER_DVDR_S101;
} else if (strbeg("PLASMON", vendor_info)) {
if (strbeg("RF4100", prod_ident))
- scgp->dev = DEV_PLASMON_RF_4100;
+ usalp->dev = DEV_PLASMON_RF_4100;
else if (strbeg("CDR4220", prod_ident))
- scgp->dev = DEV_CDD_2000;
+ usalp->dev = DEV_CDD_2000;
} else if (strbeg("PLEXTOR", vendor_info)) {
if (strbeg("CD-R PX-R24CS", prod_ident))
- scgp->dev = DEV_RICOH_RO_1420C;
+ usalp->dev = DEV_RICOH_RO_1420C;
} else if (strbeg("RICOH", vendor_info)) {
if (strbeg("RO-1420C", prod_ident))
- scgp->dev = DEV_RICOH_RO_1420C;
+ usalp->dev = DEV_RICOH_RO_1420C;
if (strbeg("RO1060C", prod_ident))
- scgp->dev = DEV_RICOH_RO_1060C;
+ usalp->dev = DEV_RICOH_RO_1060C;
} else if (strbeg("SAF", vendor_info)) { /* Smart & Friendly */
if (strbeg("CD-R2004", prod_ident) ||
strbeg("CD-R2006 ", prod_ident))
- scgp->dev = DEV_SONY_CDU_924;
+ usalp->dev = DEV_SONY_CDU_924;
else if (strbeg("CD-R2006PLUS", prod_ident))
- scgp->dev = DEV_TEAC_CD_R50S;
+ usalp->dev = DEV_TEAC_CD_R50S;
else if (strbeg("CD-RW226", prod_ident))
- scgp->dev = DEV_TEAC_CD_R50S;
+ usalp->dev = DEV_TEAC_CD_R50S;
else if (strbeg("CD-R4012", prod_ident))
- scgp->dev = DEV_TEAC_CD_R50S;
+ usalp->dev = DEV_TEAC_CD_R50S;
} else if (strbeg("SANYO", vendor_info)) {
if (strbeg("CD-WO CRD-R24S", prod_ident))
- scgp->dev = DEV_CDD_521;
+ usalp->dev = DEV_CDD_521;
} else if (strbeg("SONY", vendor_info)) {
if (strbeg("CD-R CDU92", prod_ident) ||
strbeg("CD-R CDU94", prod_ident))
- scgp->dev = DEV_SONY_CDU_924;
+ usalp->dev = DEV_SONY_CDU_924;
} else if (strbeg("TEAC", vendor_info)) {
if (strbeg("CD-R50S", prod_ident) ||
strbeg("CD-R55S", prod_ident))
- scgp->dev = DEV_TEAC_CD_R50S;
+ usalp->dev = DEV_TEAC_CD_R50S;
} else if (strbeg("TRAXDATA", vendor_info) ||
strbeg("Traxdata", vendor_info)) {
if (strbeg("CDR4120", prod_ident))
- scgp->dev = DEV_TEAC_CD_R50S;
+ usalp->dev = DEV_TEAC_CD_R50S;
} else if (strbeg("T.YUDEN", vendor_info)) {
if (strbeg("CD-WO EW-50", prod_ident))
- scgp->dev = DEV_TYUDEN_EW50;
+ usalp->dev = DEV_TYUDEN_EW50;
} else if (strbeg("WPI", vendor_info)) { /* Wearnes */
if (strbeg("CDR-632P", prod_ident))
- scgp->dev = DEV_CDD_2600;
+ usalp->dev = DEV_CDD_2600;
} else if (strbeg("YAMAHA", vendor_info)) {
if (strbeg("CDR10", prod_ident))
- scgp->dev = DEV_YAMAHA_CDR_100;
+ usalp->dev = DEV_YAMAHA_CDR_100;
if (strbeg("CDR200", prod_ident))
- scgp->dev = DEV_YAMAHA_CDR_400;
+ usalp->dev = DEV_YAMAHA_CDR_400;
if (strbeg("CDR400", prod_ident))
- scgp->dev = DEV_YAMAHA_CDR_400;
+ usalp->dev = DEV_YAMAHA_CDR_400;
} else if (strbeg("MATSHITA", vendor_info)) {
if (strbeg("CD-R CW-7501", prod_ident))
- scgp->dev = DEV_MATSUSHITA_7501;
+ usalp->dev = DEV_MATSUSHITA_7501;
if (strbeg("CD-R CW-7502", prod_ident))
- scgp->dev = DEV_MATSUSHITA_7502;
+ usalp->dev = DEV_MATSUSHITA_7502;
}
- if (scgp->dev == DEV_UNKNOWN) {
+ if (usalp->dev == DEV_UNKNOWN) {
/*
* We do not have Manufacturer strings for
* the following drives.
*/
if (strbeg("CDS615E", prod_ident)) /* Olympus */
- scgp->dev = DEV_SONY_CDU_924;
+ usalp->dev = DEV_SONY_CDU_924;
}
- if (scgp->dev == DEV_UNKNOWN && inq->type == INQ_ROMD) {
+ if (usalp->dev == DEV_UNKNOWN && inq->type == INQ_ROMD) {
BOOL cdrr = FALSE;
BOOL cdwr = FALSE;
BOOL cdrrw = FALSE;
@@ -2427,55 +2427,55 @@
BOOL dvd = FALSE;
BOOL dvdwr = FALSE;
- scgp->dev = DEV_CDROM;
+ usalp->dev = DEV_CDROM;
- if (mmc_check(scgp, &cdrr, &cdwr, &cdrrw, &cdwrw,
+ if (mmc_check(usalp, &cdrr, &cdwr, &cdrrw, &cdwrw,
&dvd, &dvdwr))
- scgp->dev = DEV_MMC_CDROM;
+ usalp->dev = DEV_MMC_CDROM;
if (cdwr)
- scgp->dev = DEV_MMC_CDR;
+ usalp->dev = DEV_MMC_CDR;
if (cdwrw)
- scgp->dev = DEV_MMC_CDRW;
+ usalp->dev = DEV_MMC_CDRW;
if (dvd)
- scgp->dev = DEV_MMC_DVD;
+ usalp->dev = DEV_MMC_DVD;
if (dvdwr)
- scgp->dev = DEV_MMC_DVD_WR;
+ usalp->dev = DEV_MMC_DVD_WR;
}
break;
case INQ_PROCD:
if (strbeg("BERTHOLD", vendor_info)) {
if (strbeg("", prod_ident))
- scgp->dev = DEV_HRSCAN;
+ usalp->dev = DEV_HRSCAN;
}
break;
case INQ_SCAN:
- scgp->dev = DEV_MS300A;
+ usalp->dev = DEV_MS300A;
break;
}
- scgp->silent--;
+ usalp->silent--;
if (!print)
return (TRUE);
- if (scgp->dev == DEV_UNKNOWN && !got_inquiry) {
+ if (usalp->dev == DEV_UNKNOWN && !got_inquiry) {
#ifdef PRINT_INQ_ERR
- scg_printerr(scgp);
+ usal_printerr(usalp);
#endif
return (FALSE);
}
- printinq(scgp, stdout);
+ printinq(usalp, stdout);
return (TRUE);
}
void
-printinq(SCSI *scgp, FILE *f)
+printinq(SCSI *usalp, FILE *f)
{
- register struct scsi_inquiry *inq = scgp->inq;
+ register struct scsi_inquiry *inq = usalp->inq;
fprintf(f, "Device type : ");
- scg_fprintdev(f, inq);
+ usal_fprintdev(f, inq);
fprintf(f, "Version : %d\n", inq->ansi_version);
fprintf(f, "Response Format: %d\n", inq->data_format);
if (inq->data_format >= 2) {
@@ -2502,11 +2502,11 @@
}
void
-printdev(SCSI *scgp)
+printdev(SCSI *usalp)
{
printf("Device seems to be: ");
- switch (scgp->dev) {
+ switch (usalp->dev) {
case DEV_UNKNOWN: printf("unknown"); break;
case DEV_ACB40X0: printf("Adaptec 4000/4010/4070"); break;
@@ -2553,7 +2553,7 @@
case DEV_PIONEER_DVDR_S101:printf("Pioneer DVD-R S101"); break;
default: printf("Missing Entry for dev %d",
- scgp->dev); break;
+ usalp->dev); break;
}
printf(".\n");
@@ -2561,11 +2561,11 @@
}
BOOL
-do_inquiry(SCSI *scgp, int print)
+do_inquiry(SCSI *usalp, int print)
{
- if (getdev(scgp, print)) {
+ if (getdev(usalp, print)) {
if (print)
- printdev(scgp);
+ printdev(usalp);
return (TRUE);
} else {
return (FALSE);
@@ -2573,14 +2573,14 @@
}
BOOL
-recovery_needed(SCSI *scgp, cdr_t *dp)
+recovery_needed(SCSI *usalp, cdr_t *dp)
{
int err;
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
- scgp->silent++;
- err = test_unit_ready(scgp);
- scgp->silent--;
+ usalp->silent++;
+ err = test_unit_ready(usalp);
+ usalp->silent--;
if (err >= 0)
return (FALSE);
@@ -2595,21 +2595,21 @@
}
int
-scsi_load(SCSI *scgp, cdr_t *dp)
+scsi_load(SCSI *usalp, cdr_t *dp)
{
int key;
int code;
if ((dp->cdr_flags & CDR_CADDYLOAD) == 0) {
- if (scsi_start_stop_unit(scgp, 1, 1, dp && (dp->cdr_cmdflags&F_IMMED)) >= 0)
+ if (scsi_start_stop_unit(usalp, 1, 1, dp && (dp->cdr_cmdflags&F_IMMED)) >= 0)
return (0);
}
- if (wait_unit_ready(scgp, 60))
+ if (wait_unit_ready(usalp, 60))
return (0);
- key = scg_sense_key(scgp);
- code = scg_sense_code(scgp);
+ key = usal_sense_key(usalp);
+ code = usal_sense_code(usalp);
if (key == SC_NOT_READY && (code == 0x3A || code == 0x30)) {
errmsgno(EX_BAD, "Cannot load media with %s drive!\n",
@@ -2620,24 +2620,24 @@
}
int
-scsi_unload(SCSI *scgp, cdr_t *dp)
+scsi_unload(SCSI *usalp, cdr_t *dp)
{
- return (scsi_start_stop_unit(scgp, 0, 1, dp && (dp->cdr_cmdflags&F_IMMED)));
+ return (scsi_start_stop_unit(usalp, 0, 1, dp && (dp->cdr_cmdflags&F_IMMED)));
}
int
-scsi_cdr_write(SCSI *scgp,
+scsi_cdr_write(SCSI *usalp,
caddr_t bp /* address of buffer */,
long sectaddr /* disk address (sector) to put */,
long size /* number of bytes to transfer */,
int blocks /* sector count */,
BOOL islast /* last write for track */)
{
- return (write_xg1(scgp, bp, sectaddr, size, blocks));
+ return (write_xg1(usalp, bp, sectaddr, size, blocks));
}
struct cd_mode_page_2A *
-mmc_cap(SCSI *scgp, Uchar *modep)
+mmc_cap(SCSI *usalp, Uchar *modep)
{
int len;
int val;
@@ -2649,11 +2649,11 @@
retry:
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- if (!get_mode_params(scgp, 0x2A, "CD capabilities",
+ if (!get_mode_params(usalp, 0x2A, "CD capabilities",
mode, (Uchar *)0, (Uchar *)0, (Uchar *)0, &len)) {
- if (scg_sense_key(scgp) == SC_NOT_READY) {
- if (wait_unit_ready(scgp, 60))
+ if (usal_sense_key(usalp) == SC_NOT_READY) {
+ if (wait_unit_ready(usalp, 60))
goto retry;
}
return (NULL); /* Pre SCSI-3/mmc drive */
@@ -2734,7 +2734,7 @@
}
BOOL
-is_mmc(SCSI *scgp, BOOL *cdwp, BOOL *dvdwp)
+is_mmc(SCSI *usalp, BOOL *cdwp, BOOL *dvdwp)
{
BOOL cdwr = FALSE;
BOOL cdwrw = FALSE;
@@ -2744,7 +2744,7 @@
if (dvdwp)
*dvdwp = FALSE;
- if (!mmc_check(scgp, NULL, &cdwr, NULL, &cdwrw, NULL, dvdwp))
+ if (!mmc_check(usalp, NULL, &cdwr, NULL, &cdwrw, NULL, dvdwp))
return (FALSE);
if (cdwp)
@@ -2754,7 +2754,7 @@
}
BOOL
-mmc_check(SCSI *scgp,
+mmc_check(SCSI *usalp,
BOOL *cdrrp /* CD ROM */,
BOOL *cdwrp /* CD-R writer */,
BOOL *cdrrwp /* CD-RW reader */,
@@ -2766,16 +2766,16 @@
BOOL was_atapi;
struct cd_mode_page_2A *mp;
- if (scgp->inq->type != INQ_ROMD)
+ if (usalp->inq->type != INQ_ROMD)
return (FALSE);
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- was_atapi = allow_atapi(scgp, TRUE);
- scgp->silent++;
- mp = mmc_cap(scgp, mode);
- scgp->silent--;
- allow_atapi(scgp, was_atapi);
+ was_atapi = allow_atapi(usalp, TRUE);
+ usalp->silent++;
+ mp = mmc_cap(usalp, mode);
+ usalp->silent--;
+ allow_atapi(usalp, was_atapi);
if (mp == NULL)
return (FALSE);
@@ -2798,7 +2798,7 @@
#define SVAL(what, val) printf(" %s: %s\n", what, val)
void
-print_capabilities(SCSI *scgp)
+print_capabilities(SCSI *usalp)
{
BOOL was_atapi;
Uchar mode[0x100];
@@ -2810,16 +2810,16 @@
static const char *rotctl[4] = {"CLV/PCAV", "CAV", "reserved(2)", "reserved(3)"};
- if (scgp->inq->type != INQ_ROMD)
+ if (usalp->inq->type != INQ_ROMD)
return;
fillbytes((caddr_t)mode, sizeof (mode), '\0');
- was_atapi = allow_atapi(scgp, TRUE); /* Try to switch to 10 byte mode cmds */
- scgp->silent++;
- mp = mmc_cap(scgp, mode);
- scgp->silent--;
- allow_atapi(scgp, was_atapi);
+ was_atapi = allow_atapi(usalp, TRUE); /* Try to switch to 10 byte mode cmds */
+ usalp->silent++;
+ mp = mmc_cap(usalp, mode);
+ usalp->silent--;
+ allow_atapi(usalp, was_atapi);
if (mp == NULL)
return;
Modified: cdrkit/trunk/wodim/scsi_cdr_mmc4.c
===================================================================
--- cdrkit/trunk/wodim/scsi_cdr_mmc4.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/scsi_cdr_mmc4.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -52,28 +52,28 @@
#include <intcvt.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsidefs.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsidefs.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include "scsimmc.h"
#include "wodim.h"
-void print_capabilities_mmc4(SCSI *scgp);
+void print_capabilities_mmc4(SCSI *usalp);
#define DOES(what, flag) printf(" Does %s%s\n", flag?"":"not ", what)
void
-print_capabilities_mmc4(SCSI *scgp)
+print_capabilities_mmc4(SCSI *usalp)
{
int cdrw_types;
- if (scgp->inq->type != INQ_ROMD)
+ if (usalp->inq->type != INQ_ROMD)
return;
- cdrw_types = get_supported_cdrw_media_types(scgp);
+ cdrw_types = get_supported_cdrw_media_types(usalp);
if (cdrw_types != -1) {
printf("\nSupported CD-RW media types according to MMC-4 feature 0x37:\n");
DOES("write multi speed CD-RW media", (cdrw_types & CDR_CDRW_MULTI));
Modified: cdrkit/trunk/wodim/scsi_mmc.c
===================================================================
--- cdrkit/trunk/wodim/scsi_mmc.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/scsi_mmc.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -54,10 +54,10 @@
#include <intcvt.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsidefs.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsidefs.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include "scsimmc.h"
#include "wodim.h"
@@ -66,24 +66,24 @@
-int get_configuration(SCSI *scgp, caddr_t bp, int cnt, int st_feature,
+int get_configuration(SCSI *usalp, caddr_t bp, int cnt, int st_feature,
int rt);
-static int get_conflen(SCSI *scgp, int st_feature, int rt);
-int get_curprofile(SCSI *scgp);
-static int get_profiles(SCSI *scgp, caddr_t bp, int cnt);
-int print_profiles(SCSI *scgp);
-int get_proflist(SCSI *scgp, BOOL *wp, BOOL *cdp, BOOL *dvdp, BOOL *dvdplusp,
+static int get_conflen(SCSI *usalp, int st_feature, int rt);
+int get_curprofile(SCSI *usalp);
+static int get_profiles(SCSI *usalp, caddr_t bp, int cnt);
+int print_profiles(SCSI *usalp);
+int get_proflist(SCSI *usalp, BOOL *wp, BOOL *cdp, BOOL *dvdp, BOOL *dvdplusp,
BOOL *ddcdp);
-int get_wproflist(SCSI *scgp, BOOL *cdp, BOOL *dvdp, BOOL *dvdplusp,
+int get_wproflist(SCSI *usalp, BOOL *cdp, BOOL *dvdp, BOOL *dvdplusp,
BOOL *ddcdp);
/*
* Get feature codes
*/
int
-get_configuration(SCSI *scgp, caddr_t bp, int cnt, int st_feature, int rt)
+get_configuration(SCSI *usalp, caddr_t bp, int cnt, int st_feature, int rt)
{
- register struct scg_cmd *scmd = scgp->scmd;
+ register struct usal_cmd *scmd = usalp->scmd;
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
@@ -92,7 +92,7 @@
scmd->cdb_len = SC_G1_CDBLEN;
scmd->sense_len = CCS_SENSE_LEN;
scmd->cdb.g1_cdb.cmd = 0x46;
- scmd->cdb.g1_cdb.lun = scg_lun(scgp);
+ scmd->cdb.g1_cdb.lun = usal_lun(usalp);
if (rt & 1)
scmd->cdb.g1_cdb.reladr = 1;
if (rt & 2)
@@ -101,28 +101,28 @@
i_to_2_byte(scmd->cdb.g1_cdb.addr, st_feature);
g1_cdblen(&scmd->cdb.g1_cdb, cnt);
- scgp->cmdname = "get_configuration";
+ usalp->cmdname = "get_configuration";
- return (scg_cmd(scgp));
+ return (usal_cmd(usalp));
}
/*
* Retrieve feature code list length
*/
static int
-get_conflen(SCSI *scgp, int st_feature, int rt)
+get_conflen(SCSI *usalp, int st_feature, int rt)
{
Uchar cbuf[8];
int flen;
int i;
fillbytes(cbuf, sizeof (cbuf), '\0');
- scgp->silent++;
- i = get_configuration(scgp, (char *)cbuf, sizeof (cbuf), st_feature, rt);
- scgp->silent--;
+ usalp->silent++;
+ i = get_configuration(usalp, (char *)cbuf, sizeof (cbuf), st_feature, rt);
+ usalp->silent--;
if (i < 0)
return (-1);
- i = sizeof (cbuf) - scg_getresid(scgp);
+ i = sizeof (cbuf) - usal_getresid(usalp);
if (i < 4)
return (-1);
@@ -133,7 +133,7 @@
}
int
-get_curprofile(SCSI *scgp)
+get_curprofile(SCSI *usalp)
{
Uchar cbuf[8];
int amt;
@@ -142,13 +142,13 @@
int i;
fillbytes(cbuf, sizeof (cbuf), '\0');
- scgp->silent++;
- i = get_configuration(scgp, (char *)cbuf, sizeof (cbuf), 0, 0);
- scgp->silent--;
+ usalp->silent++;
+ i = get_configuration(usalp, (char *)cbuf, sizeof (cbuf), 0, 0);
+ usalp->silent--;
if (i < 0)
return (-1);
- amt = sizeof (cbuf) - scg_getresid(scgp);
+ amt = sizeof (cbuf) - usal_getresid(usalp);
if (amt < 8)
return (-1);
flen = a_to_u_4_byte(cbuf);
@@ -158,7 +158,7 @@
profile = a_to_u_2_byte(&cbuf[6]);
if (xdebug > 1)
- scg_prbytes("Features: ", cbuf, amt);
+ usal_prbytes("Features: ", cbuf, amt);
if (xdebug > 0)
printf("feature len: %d current profile 0x%04X len %d\n",
@@ -168,25 +168,25 @@
}
static int
-get_profiles(SCSI *scgp, caddr_t bp, int cnt)
+get_profiles(SCSI *usalp, caddr_t bp, int cnt)
{
int amt;
int flen;
int i;
- flen = get_conflen(scgp, 0, 0);
+ flen = get_conflen(usalp, 0, 0);
if (flen < 0)
return (-1);
if (cnt < flen)
flen = cnt;
fillbytes(bp, cnt, '\0');
- scgp->silent++;
- i = get_configuration(scgp, (char *)bp, flen, 0, 0);
- scgp->silent--;
+ usalp->silent++;
+ i = get_configuration(usalp, (char *)bp, flen, 0, 0);
+ usalp->silent--;
if (i < 0)
return (-1);
- amt = flen - scg_getresid(scgp);
+ amt = flen - usal_getresid(usalp);
flen = a_to_u_4_byte(bp);
if ((flen+4) < amt)
@@ -196,7 +196,7 @@
}
int
-print_profiles(SCSI *scgp)
+print_profiles(SCSI *usalp)
{
Uchar cbuf[1024];
Uchar *p;
@@ -206,13 +206,13 @@
int i;
int n;
- flen = get_profiles(scgp, (caddr_t)cbuf, sizeof (cbuf));
+ flen = get_profiles(usalp, (caddr_t)cbuf, sizeof (cbuf));
if (flen < 0)
return (-1);
p = cbuf;
if (xdebug > 1)
- scg_prbytes("Features: ", cbuf, flen);
+ usal_prbytes("Features: ", cbuf, flen);
curprofile = a_to_u_2_byte(&p[6]);
if (xdebug > 0)
@@ -239,7 +239,7 @@
}
int
-get_proflist(SCSI *scgp, BOOL *wp, BOOL *cdp, BOOL *dvdp, BOOL *dvdplusp,
+get_proflist(SCSI *usalp, BOOL *wp, BOOL *cdp, BOOL *dvdp, BOOL *dvdplusp,
BOOL *ddcdp)
{
Uchar cbuf[1024];
@@ -255,13 +255,13 @@
BOOL dvdplus = FALSE;
BOOL ddcd = FALSE;
- flen = get_profiles(scgp, (caddr_t)cbuf, sizeof (cbuf));
+ flen = get_profiles(usalp, (caddr_t)cbuf, sizeof (cbuf));
if (flen < 0)
return (-1);
p = cbuf;
if (xdebug > 1)
- scg_prbytes("Features: ", cbuf, flen);
+ usal_prbytes("Features: ", cbuf, flen);
curprofile = a_to_u_2_byte(&p[6]);
if (xdebug > 0)
@@ -311,7 +311,7 @@
}
int
-get_wproflist(SCSI *scgp, BOOL *cdp, BOOL *dvdp, BOOL *dvdplusp, BOOL *ddcdp)
+get_wproflist(SCSI *usalp, BOOL *cdp, BOOL *dvdp, BOOL *dvdplusp, BOOL *ddcdp)
{
Uchar cbuf[1024];
Uchar *p;
@@ -325,7 +325,7 @@
BOOL dvdplus = FALSE;
BOOL ddcd = FALSE;
- flen = get_profiles(scgp, (caddr_t)cbuf, sizeof (cbuf));
+ flen = get_profiles(usalp, (caddr_t)cbuf, sizeof (cbuf));
if (flen < 0)
return (-1);
p = cbuf;
Modified: cdrkit/trunk/wodim/scsi_mmc4.c
===================================================================
--- cdrkit/trunk/wodim/scsi_mmc4.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/scsi_mmc4.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -53,29 +53,29 @@
#include <intcvt.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsidefs.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsidefs.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include "scsimmc.h"
#include "wodim.h"
- int get_supported_cdrw_media_types(SCSI *scgp);
+ int get_supported_cdrw_media_types(SCSI *usalp);
/*
* Retrieve list of supported cd-rw media types (feature 0x37)
*/
int
-get_supported_cdrw_media_types(SCSI *scgp)
+get_supported_cdrw_media_types(SCSI *usalp)
{
Uchar cbuf[16];
int ret;
fillbytes(cbuf, sizeof (cbuf), '\0');
- scgp->silent++;
- ret = get_configuration(scgp, (char *)cbuf, sizeof (cbuf), 0x37, 2);
- scgp->silent--;
+ usalp->silent++;
+ ret = get_configuration(usalp, (char *)cbuf, sizeof (cbuf), 0x37, 2);
+ usalp->silent--;
if (ret < 0)
return (-1);
Modified: cdrkit/trunk/wodim/scsi_scan.c
===================================================================
--- cdrkit/trunk/wodim/scsi_scan.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/scsi_scan.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -45,17 +45,17 @@
#include <errno.h>
#include <schily.h>
-#include <scg/scgcmd.h>
-#include <scg/scsidefs.h>
-#include <scg/scsireg.h>
-#include <scg/scsitransp.h>
+#include <usal/usalcmd.h>
+#include <usal/scsidefs.h>
+#include <usal/scsireg.h>
+#include <usal/scsitransp.h>
#include "scsi_scan.h"
#include "wodim.h"
static void print_product(FILE *f, struct scsi_inquiry *ip);
-int select_target(SCSI *scgp, FILE *f);
-static int select_unit(SCSI *scgp, FILE *f);
+int select_target(SCSI *usalp, FILE *f);
+static int select_unit(SCSI *usalp, FILE *f);
static void
print_product(FILE *f, struct scsi_inquiry *ip)
@@ -66,17 +66,17 @@
if (ip->add_len < 31) {
fprintf(f, "NON CCS ");
}
- scg_fprintdev(f, ip);
+ usal_fprintdev(f, ip);
}
int
-select_target(SCSI *scgp, FILE *f)
+select_target(SCSI *usalp, FILE *f)
{
int initiator;
#ifdef FMT
- int cscsibus = scg_scsibus(scgp);
- int ctarget = scg_target(scgp);
- int clun = scg_lun(scgp);
+ int cscsibus = usal_scsibus(usalp);
+ int ctarget = usal_target(usalp);
+ int clun = usal_lun(usalp);
#endif
int n;
int low = -1;
@@ -87,25 +87,25 @@
int lun = 0;
BOOL have_tgt;
- scgp->silent++;
+ usalp->silent++;
for (bus = 0; bus < 256; bus++) {
- scg_settarget(scgp, bus, 0, 0);
+ usal_settarget(usalp, bus, 0, 0);
- if (!scg_havebus(scgp, bus))
+ if (!usal_havebus(usalp, bus))
continue;
- initiator = scg_initiator_id(scgp);
+ initiator = usal_initiator_id(usalp);
fprintf(f, "scsibus%d:\n", bus);
for (tgt = 0; tgt < 16; tgt++) {
n = bus*100 + tgt;
- scg_settarget(scgp, bus, tgt, lun);
- have_tgt = unit_ready(scgp) || scgp->scmd->error != SCG_FATAL;
+ usal_settarget(usalp, bus, tgt, lun);
+ have_tgt = unit_ready(usalp) || usalp->scmd->error != SCG_FATAL;
if (!have_tgt && tgt > 7) {
- if (scgp->scmd->ux_errno == EINVAL)
+ if (usalp->scmd->ux_errno == EINVAL)
break;
continue;
}
@@ -131,7 +131,7 @@
/*
* Hack: fd -> -2 means no access
*/
- fprintf(f, "%c\n", scgp->fd == -2 ? '?':'*');
+ fprintf(f, "%c\n", usalp->fd == -2 ? '?':'*');
continue;
}
amt++;
@@ -139,11 +139,11 @@
low = n;
high = n;
- getdev(scgp, FALSE);
- print_product(f, scgp->inq);
+ getdev(usalp, FALSE);
+ print_product(f, usalp->inq);
}
}
- scgp->silent--;
+ usalp->silent--;
if (low < 0) {
errmsgno(EX_BAD, "No target found.\n");
@@ -154,55 +154,55 @@
getint("Select target", &n, low, high);
bus = n/100;
tgt = n%100;
- scg_settarget(scgp, bus, tgt, lun);
- return (select_unit(scgp));
+ usal_settarget(usalp, bus, tgt, lun);
+ return (select_unit(usalp));
- scg_settarget(scgp, cscsibus, ctarget, clun);
+ usal_settarget(usalp, cscsibus, ctarget, clun);
#endif
return (amt);
}
static int
-select_unit(SCSI *scgp, FILE *f)
+select_unit(SCSI *usalp, FILE *f)
{
int initiator;
- int clun = scg_lun(scgp);
+ int clun = usal_lun(usalp);
int low = -1;
int high = -1;
int lun;
- scgp->silent++;
+ usalp->silent++;
- fprintf(f, "scsibus%d target %d:\n", scg_scsibus(scgp), scg_target(scgp));
+ fprintf(f, "scsibus%d target %d:\n", usal_scsibus(usalp), usal_target(usalp));
- initiator = scg_initiator_id(scgp);
+ initiator = usal_initiator_id(usalp);
for (lun = 0; lun < 8; lun++) {
#ifdef FMT
- if (print_disknames(scg_scsibus(scgp), scg_target(scgp), lun) < 8)
+ if (print_disknames(usal_scsibus(usalp), usal_target(usalp), lun) < 8)
fprintf(f, "\t");
else
fprintf(f, " ");
#else
fprintf(f, "\t");
#endif
- if (fprintf(f, "%d,%d,%d", scg_scsibus(scgp), scg_target(scgp), lun) < 8)
+ if (fprintf(f, "%d,%d,%d", usal_scsibus(usalp), usal_target(usalp), lun) < 8)
fprintf(f, "\t");
else
fprintf(f, " ");
fprintf(f, "%3d) ", lun);
- if (scg_target(scgp) == initiator) {
+ if (usal_target(usalp) == initiator) {
fprintf(f, "HOST ADAPTOR\n");
continue;
}
- scg_settarget(scgp, scg_scsibus(scgp), scg_target(scgp), lun);
- if (!unit_ready(scgp) && scgp->scmd->error == SCG_FATAL) {
+ usal_settarget(usalp, usal_scsibus(usalp), usal_target(usalp), lun);
+ if (!unit_ready(usalp) && usalp->scmd->error == SCG_FATAL) {
fprintf(f, "*\n");
continue;
}
- if (unit_ready(scgp)) {
+ if (unit_ready(usalp)) {
/* non extended sense illegal lun */
- if (scgp->scmd->sense.code == 0x25) {
+ if (usalp->scmd->sense.code == 0x25) {
fprintf(f, "BAD UNIT\n");
continue;
}
@@ -211,10 +211,10 @@
low = lun;
high = lun;
- getdev(scgp, FALSE);
- print_product(f, scgp->inq);
+ getdev(usalp, FALSE);
+ print_product(f, usalp->inq);
}
- scgp->silent--;
+ usalp->silent--;
if (low < 0) {
errmsgno(EX_BAD, "No lun found.\n");
@@ -223,11 +223,11 @@
lun = -1;
#ifdef FMT
getint("Select lun", &lun, low, high);
- scg_settarget(scgp, scg_scsibus(scgp), scg_target(scgp), lun);
- format_one(scgp);
+ usal_settarget(usalp, usal_scsibus(usalp), usal_target(usalp), lun);
+ format_one(usalp);
return (1);
#endif
- scg_settarget(scgp, scg_scsibus(scgp), scg_target(scgp), clun);
+ usal_settarget(usalp, usal_scsibus(usalp), usal_target(usalp), clun);
return (1);
}
Modified: cdrkit/trunk/wodim/scsi_scan.h
===================================================================
--- cdrkit/trunk/wodim/scsi_scan.h 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/scsi_scan.h 2006-11-23 18:57:28 UTC (rev 430)
@@ -34,6 +34,6 @@
#ifndef _SCSI_SCAN_H
#define _SCSI_SCAN_H
-extern int select_target(SCSI *scgp, FILE *f);
+extern int select_target(SCSI *usalp, FILE *f);
#endif /* _SCSI_SCAN_H */
Modified: cdrkit/trunk/wodim/subchan.c
===================================================================
--- cdrkit/trunk/wodim/subchan.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/subchan.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -42,14 +42,14 @@
#include <utypes.h>
#include <schily.h>
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
#include "wodim.h"
#include "crc16.h"
int do_leadin(track_t *trackp);
-int write_leadin(SCSI *scgp, cdr_t *dp, track_t *trackp, int leadinstart);
-int write_leadout(SCSI *scgp, cdr_t *dp, track_t *trackp);
+int write_leadin(SCSI *usalp, cdr_t *dp, track_t *trackp, int leadinstart);
+int write_leadout(SCSI *usalp, cdr_t *dp, track_t *trackp);
void fillsubch(track_t *trackp, Uchar *sp, int secno, int nsecs);
void filltpoint(Uchar *sub, int ctrl_adr, int point, msf_t *mp);
void fillttime(Uchar *sub, msf_t *mp);
@@ -139,7 +139,7 @@
m.msf_frame = 0;
filltpoint(_subq[0], ctrl|0x01, 0xA0, &m);
if (lverbose > 1)
- scg_prbytes("", _subq[0], 12);
+ usal_prbytes("", _subq[0], 12);
/*
* Fill in point 0xA1 for last track # on disk
@@ -152,7 +152,7 @@
m.msf_frame = 0;
filltpoint(_subq[1], ctrl|0x01, 0xA1, &m);
if (lverbose > 1)
- scg_prbytes("", _subq[1], 12);
+ usal_prbytes("", _subq[1], 12);
/*
* Fill in point 0xA2 for lead out start time on disk
@@ -163,7 +163,7 @@
ctrl |= TM_ALLOW_COPY << 4;
filltpoint(_subq[2], ctrl|0x01, 0xA2, &m);
if (lverbose > 1)
- scg_prbytes("", _subq[2], 12);
+ usal_prbytes("", _subq[2], 12);
/*
* Fill in track start times.
@@ -175,7 +175,7 @@
ctrl |= TM_ALLOW_COPY << 4;
filltpoint(_subq[i-1+3], ctrl|0x01, to_bcd(trackp[i].trackno), &m); /* track n */
if (lverbose > 1)
- scg_prbytes("", _subq[i-1+3], 12);
+ usal_prbytes("", _subq[i-1+3], 12);
}
return (0);
}
@@ -187,12 +187,12 @@
* subchannel frames for the lead-in.
*/
int
-write_leadin(SCSI *scgp, cdr_t *dp, track_t *trackp, int leadinstart)
+write_leadin(SCSI *usalp, cdr_t *dp, track_t *trackp, int leadinstart)
{
msf_t m;
int i;
Uint j;
- Uchar *bp = scgp->bufptr;
+ Uchar *bp = usalp->bufptr;
Uchar *subp;
Uchar *sp;
int secsize;
@@ -249,7 +249,7 @@
fillttime(_subq[j/3], &m);
fillcrc(_subq[j/3], 12);
if (xdebug > 2)
- scg_prbytes("", _subq[j/3], 12);
+ usal_prbytes("", _subq[j/3], 12);
if (is_raw16(&trackp[0])) {
qpto16(subp, _subq[j/3], 0);
} else {
@@ -273,7 +273,7 @@
}
encsectors(trackp, bp, startsec, secspt);
- amount = write_secs(scgp, dp,
+ amount = write_secs(usalp, dp,
(char *)bp, startsec, bytespt, secspt, FALSE);
if (amount < 0) {
printf("write leadin data: error after %ld bytes\n",
@@ -296,7 +296,7 @@
* Write Track 0xAA (lead-out)
*/
int
-write_leadout(SCSI *scgp, cdr_t *dp, track_t *trackp)
+write_leadout(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
int tracks = trackp->tracks;
msf_t m;
@@ -304,7 +304,7 @@
int ctrl;
int i;
int j;
- Uchar *bp = scgp->bufptr;
+ Uchar *bp = usalp->bufptr;
Uchar *subp;
Uchar *sp;
int secsize;
@@ -359,7 +359,7 @@
if (j < 150)
p = FALSE;
if (xdebug > 2)
- scg_prbytes(p?"P":" ", sub, 12);
+ usal_prbytes(p?"P":" ", sub, 12);
if (is_raw16(&trackp[0])) {
qpto16(subp, sub, p);
@@ -375,7 +375,7 @@
}
encsectors(trackp, bp, startsec, secspt);
- amount = write_secs(scgp, dp,
+ amount = write_secs(usalp, dp,
(char *)bp, startsec, bytespt, secspt, FALSE);
if (amount < 0) {
printf("write leadout data: error after %ld bytes\n",
@@ -546,7 +546,7 @@
}
fillcrc(sub, 12);
if (xdebug > 2)
- scg_prbytes(curindex == 0 ? "P":" ", sub, 12);
+ usal_prbytes(curindex == 0 ? "P":" ", sub, 12);
if (is_raw16(trackp)) {
qpto16(sup, sub, curindex == 0);
} else {
Modified: cdrkit/trunk/wodim/wm_packet.c
===================================================================
--- cdrkit/trunk/wodim/wm_packet.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/wm_packet.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -45,7 +45,7 @@
#include <utypes.h>
#include <schily.h>
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
#include "wodim.h"
#include "xio.h"
@@ -55,10 +55,10 @@
extern char *buf; /* The transfer buffer */
-int write_packet_data(SCSI *scgp, cdr_t *dp, track_t *trackp);
+int write_packet_data(SCSI *usalp, cdr_t *dp, track_t *trackp);
int
-write_packet_data(SCSI *scgp, cdr_t *dp, track_t *trackp)
+write_packet_data(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
int track = trackp->trackno;
int f = -1;
@@ -96,14 +96,14 @@
if (dp->cdr_dstat->ds_flags & DSF_DVD)
secsps = 676.27;
- scgp->silent++;
- if ((*dp->cdr_buffer_cap)(scgp, &bsize, &bfree) < 0)
+ usalp->silent++;
+ if ((*dp->cdr_buffer_cap)(usalp, &bsize, &bfree) < 0)
bsize = -1L;
if (bsize == 0) /* If we have no (known) buffer, we cannot */
bsize = -1L; /* retrieve the buffer fill ratio */
else
dp->cdr_dstat->ds_buflow = 0;
- scgp->silent--;
+ usalp->silent--;
if (trackp->xfp != NULL)
f = xfileno(trackp->xfp);
@@ -186,10 +186,10 @@
retry:
/* XXX Fixed-packet writes can be very slow*/
if (is_packet(trackp) && trackp->pktsize > 0)
- scg_settimeout(scgp, 100);
+ usal_settimeout(usalp, 100);
/* XXX */
if (is_packet(trackp) && trackp->pktsize == 0) {
- if ((*dp->cdr_next_wr_address)(scgp, trackp, &nextblock) == 0) {
+ if ((*dp->cdr_next_wr_address)(usalp, trackp, &nextblock) == 0) {
/*
* Some drives (e.g. Ricoh MPS6201S) do not
* increment the Next Writable Address value to
@@ -204,7 +204,7 @@
}
}
- amount = write_secs(scgp, dp, bp, startsec, bytespt, secspt, islast);
+ amount = write_secs(usalp, dp, bp, startsec, bytespt, secspt, islast);
if (amount < 0) {
if (is_packet(trackp) && trackp->pktsize == 0 && !retried) {
printf("%swrite track data: error after %lld bytes, retry with new packet\n",
@@ -237,9 +237,9 @@
printf(" (fifo %3d%%)", fper);
#ifdef BCAP
if (bsize > 0) { /* buffer size known */
- scgp->silent++;
- per = (*dp->cdr_buffer_cap)(scgp, (long *)0, &bfree);
- scgp->silent--;
+ usalp->silent++;
+ per = (*dp->cdr_buffer_cap)(usalp, (long *)0, &bfree);
+ usalp->silent--;
if (per >= 0) {
per = 100*(bsize - bfree) / bsize;
if (per < 5)
@@ -299,7 +299,7 @@
track, (Llong)(padbytes >> 10));
neednl = FALSE;
}
- pad_track(scgp, dp, trackp, startsec, padbytes,
+ pad_track(usalp, dp, trackp, startsec, padbytes,
TRUE, &savbytes);
bytes += savbytes;
startsec += savbytes / secsize;
Modified: cdrkit/trunk/wodim/wm_session.c
===================================================================
--- cdrkit/trunk/wodim/wm_session.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/wm_session.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -43,7 +43,7 @@
#include <standard.h>
#include <utypes.h>
-#include <scg/scsitransp.h>
+#include <usal/scsitransp.h>
#include "wodim.h"
extern int debug;
@@ -52,4 +52,4 @@
extern char *buf; /* The transfer buffer */
-int write_session_data(SCSI *scgp, cdr_t *dp, track_t *trackp);
+int write_session_data(SCSI *usalp, cdr_t *dp, track_t *trackp);
Modified: cdrkit/trunk/wodim/wodim.1
===================================================================
--- cdrkit/trunk/wodim/wodim.1 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/wodim.1 2006-11-23 18:57:28 UTC (rev 430)
@@ -239,7 +239,7 @@
.I -dd,
this equals to
.BI debug= 2.
-This may help to find problems while opening a driver for libscg
+This may help to find problems while opening a driver for libusal
as well as with sector sizes and sector types.
Using
.B \-debug
@@ -247,7 +247,7 @@
.TP
.BR kdebug= "#, " kd= #
Tell the
-.BR scg -driver
+.BR usal -driver
to modify the kernel debug value while SCSI commands are running.
.TP
.BR \-silent ", " \-s
@@ -741,7 +741,7 @@
.B ts=
option has been specified,
.B wodim
-defaults to a transfer size of 63\ kB. If libscg gets lower values from the
+defaults to a transfer size of 63\ kB. If libusal gets lower values from the
operating system, the value is reduced to the maximum value that is possible
with the current operating system.
Sometimes, it may help to further reduce the transfer size or to enhance it,
@@ -2091,7 +2091,7 @@
.SH SEE ALSO
.BR cdda2wav (1),
.BR readcd (1),
-.BR scg (7),
+.BR usal (7),
.BR fbk (7),
.BR mkisofs (8),
.BR rcmd (3),
@@ -2290,7 +2290,7 @@
.TP 15
Joerg Schilling (schilling at fokus.fhg.de)
.br
-For writing cdrecord and libscg which represent the most part of wodim's code.
+For writing cdrecord and libusal which represent the most part of wodim's code.
.PP
.TP 15
Bill Swartz (Bill_Swartz at twolf.com)
Modified: cdrkit/trunk/wodim/wodim.c
===================================================================
--- cdrkit/trunk/wodim/wodim.c 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/wodim.c 2006-11-23 18:57:28 UTC (rev 430)
@@ -67,9 +67,9 @@
#include "xio.h"
-#include <scg/scsireg.h> /* XXX wegen SC_NOT_READY */
-#include <scg/scsitransp.h>
-#include <scg/scgcmd.h> /* XXX fuer read_buffer */
+#include <usal/scsireg.h> /* XXX wegen SC_NOT_READY */
+#include <usal/scsitransp.h>
+#include <usal/usalcmd.h> /* XXX fuer read_buffer */
#include "scsi_scan.h"
#include "auheader.h"
@@ -211,12 +211,12 @@
int read_buf(int f, char *bp, int size);
int fill_buf(int f, track_t *trackp, long secno, char *bp, int size);
int get_buf(int f, track_t *trackp, long secno, char **bpp, int size);
-int write_secs(SCSI *scgp, cdr_t *dp, char *bp, long startsec, int bytespt,
+int write_secs(SCSI *usalp, cdr_t *dp, char *bp, long startsec, int bytespt,
int secspt, BOOL islast);
-static int write_track_data(SCSI *scgp, cdr_t *, track_t *);
-int pad_track(SCSI *scgp, cdr_t *dp, track_t *trackp, long startsec,
+static int write_track_data(SCSI *usalp, cdr_t *, track_t *);
+int pad_track(SCSI *usalp, cdr_t *dp, track_t *trackp, long startsec,
Llong amt, BOOL dolast, Llong *bytesp);
-int write_buf(SCSI *scgp, cdr_t *dp, track_t *trackp, char *bp,
+int write_buf(SCSI *usalp, cdr_t *dp, track_t *trackp, char *bp,
long startsec, Llong amt, int secsize, BOOL dolast,
Llong *bytesp);
static void printdata(int, track_t *);
@@ -228,22 +228,22 @@
static long checktsize(int, track_t *);
static void opentracks(track_t *);
static void checksize(track_t *);
-static BOOL checkdsize(SCSI *scgp, cdr_t *dp, long tsize, int flags);
+static BOOL checkdsize(SCSI *usalp, cdr_t *dp, long tsize, int flags);
static void raise_fdlim(void);
static void raise_memlock(void);
static int gargs(int, char **, int *, track_t *, char **, int *, cdr_t **,
int *, long *, int *, int *);
static void set_trsizes(cdr_t *, int, track_t *);
-void load_media(SCSI *scgp, cdr_t *, BOOL);
-void unload_media(SCSI *scgp, cdr_t *, int);
-void reload_media(SCSI *scgp, cdr_t *);
-void set_secsize(SCSI *scgp, int secsize);
-static int get_dmaspeed(SCSI *scgp, cdr_t *);
-static BOOL do_opc(SCSI *scgp, cdr_t *, int);
-static void check_recovery(SCSI *scgp, cdr_t *, int);
-void audioread(SCSI *scgp, cdr_t *, int);
-static void print_msinfo(SCSI *scgp, cdr_t *);
-static void print_toc(SCSI *scgp, cdr_t *);
+void load_media(SCSI *usalp, cdr_t *, BOOL);
+void unload_media(SCSI *usalp, cdr_t *, int);
+void reload_media(SCSI *usalp, cdr_t *);
+void set_secsize(SCSI *usalp, int secsize);
+static int get_dmaspeed(SCSI *usalp, cdr_t *);
+static BOOL do_opc(SCSI *usalp, cdr_t *, int);
+static void check_recovery(SCSI *usalp, cdr_t *, int);
+void audioread(SCSI *usalp, cdr_t *, int);
+static void print_msinfo(SCSI *usalp, cdr_t *);
+static void print_toc(SCSI *usalp, cdr_t *);
static void print_track(int, long, struct msf *, int, int, int);
#if !defined(HAVE_SYS_PRIOCNTL_H)
static int rt_raisepri(int);
@@ -264,7 +264,7 @@
#endif
struct exargs {
- SCSI *scgp;
+ SCSI *usalp;
cdr_t *dp;
int old_secsize;
int flags;
@@ -291,7 +291,7 @@
cdr_t *dp = (cdr_t *)0;
long startsec = 0L;
int errs = 0;
- SCSI *scgp = NULL;
+ SCSI *usalp = NULL;
char errstr[80];
BOOL gracedone = FALSE;
int ispacket;
@@ -338,7 +338,7 @@
/*
* Try to lock us im memory (will only work for root)
* but you need access to root anyway to send SCSI commands.
- * We need to be root to open /dev/scg? or similar devices
+ * We need to be root to open /dev/usal? or similar devices
* on other OS variants and we need to be root to be able
* to send SCSI commands at least on AIX and
* Solaris (USCSI only) regardless of the permissions for
@@ -386,30 +386,30 @@
}
/*
- * Call scg_remote() to force loading the remote SCSI transport library
- * code that is located in librscg instead of the dummy remote routines
- * that are located inside libscg.
+ * Call usal_remote() to force loading the remote SCSI transport library
+ * code that is located in librusal instead of the dummy remote routines
+ * that are located inside libusal.
*/
- scg_remote();
+ usal_remote();
if (dev != NULL &&
((strncmp(dev, "HELP", 4) == 0) ||
(strncmp(dev, "help", 4) == 0))) {
- scg_help(stderr);
+ usal_help(stderr);
exit(0);
}
- scgp = scg_open(dev, errstr, sizeof (errstr),
+ usalp = usal_open(dev, errstr, sizeof (errstr),
debug, lverbose);
- if(!scgp && dev) {
+ if(!usalp && dev) {
char *dalt;
int len=5+strlen(dev);
dalt=calloc(len, sizeof(char));
strcat(dalt, "ATA:");
strcat(dalt+4, dev);
- scgp = scg_open(dalt, errstr, sizeof (errstr),
+ usalp = usal_open(dalt, errstr, sizeof (errstr),
debug, lverbose);
}
- if(!scgp)
+ if(!usalp)
{
errmsg("\nCannot open SCSI driver!\n"
"For possible targets try 'wodim -scanbus'.\n"
@@ -474,25 +474,25 @@
* XXX It may be that we later get problems in init_faio() because
* XXX this function calls raisepri() to lower the priority slightly.
*/
- scg_settimeout(scgp, timeout);
- scgp->verbose = scsi_verbose;
- scgp->silent = silent;
- scgp->debug = debug;
- scgp->kdebug = kdebug;
- scgp->cap->c_bsize = DATA_SEC_SIZE;
+ usal_settimeout(usalp, timeout);
+ usalp->verbose = scsi_verbose;
+ usalp->silent = silent;
+ usalp->debug = debug;
+ usalp->kdebug = kdebug;
+ usalp->cap->c_bsize = DATA_SEC_SIZE;
if ((flags & F_MSINFO) == 0 || lverbose) {
char *vers;
char *auth;
- vers = scg_version(0, SCG_VERSION);
- auth = scg_version(0, SCG_AUTHOR);
+ vers = usal_version(0, SCG_VERSION);
+ auth = usal_version(0, SCG_AUTHOR);
if(lverbose >1 && auth && vers)
- fprintf(stderr, "Using libscg version '%s-%s'.\n", auth, vers);
+ fprintf(stderr, "Using libusal version '%s-%s'.\n", auth, vers);
- vers = scg_version(scgp, SCG_RVERSION);
- auth = scg_version(scgp, SCG_RAUTHOR);
+ vers = usal_version(usalp, SCG_RVERSION);
+ auth = usal_version(usalp, SCG_RAUTHOR);
if (lverbose > 1 && vers && auth)
fprintf(stderr, "Using remote transport code version '%s-%s'\n", auth, vers);
}
@@ -500,23 +500,23 @@
if (lverbose && driveropts)
printf("Driveropts: '%s'\n", driveropts);
-/* bufsize = scg_bufsize(scgp, CDR_BUF_SIZE);*/
- bufsize = scg_bufsize(scgp, bufsize);
+/* bufsize = usal_bufsize(usalp, CDR_BUF_SIZE);*/
+ bufsize = usal_bufsize(usalp, bufsize);
if (lverbose || debug)
fprintf(stderr, "SCSI buffer size: %ld\n", bufsize);
- if ((buf = scg_getbuf(scgp, bufsize)) == NULL)
+ if ((buf = usal_getbuf(usalp, bufsize)) == NULL)
comerr("Cannot get SCSI I/O buffer.\n");
if ((flags & F_SCANBUS) != 0) {
- select_target(scgp, stdout);
+ select_target(usalp, stdout);
exit(0);
}
if ((flags & F_RESET) != 0) {
- if (scg_reset(scgp, SCG_RESET_NOP) < 0)
+ if (usal_reset(usalp, SCG_RESET_NOP) < 0)
comerr("Cannot reset (OS does not implement reset).\n");
- if (scg_reset(scgp, SCG_RESET_TGT) >= 0)
+ if (usal_reset(usalp, SCG_RESET_TGT) >= 0)
exit(0);
- if (scg_reset(scgp, SCG_RESET_BUS) < 0)
+ if (usal_reset(usalp, SCG_RESET_BUS) < 0)
comerr("Cannot reset target.\n");
exit(0);
}
@@ -526,13 +526,13 @@
* have.
*/
if (debug || lverbose)
- printf("atapi: %d\n", scg_isatapi(scgp));
- scgp->silent++;
- test_unit_ready(scgp); /* eat up unit attention */
- scgp->silent--;
- if (!do_inquiry(scgp, (flags & F_MSINFO) == 0 || lverbose)) {
+ printf("atapi: %d\n", usal_isatapi(usalp));
+ usalp->silent++;
+ test_unit_ready(usalp); /* eat up unit attention */
+ usalp->silent--;
+ if (!do_inquiry(usalp, (flags & F_MSINFO) == 0 || lverbose)) {
errmsgno(EX_BAD, "Cannot do inquiry for CD/DVD-Recorder.\n");
- if (unit_ready(scgp))
+ if (unit_ready(usalp))
errmsgno(EX_BAD, "The unit seems to be hung and needs power cycling.\n");
exit(EX_BAD);
}
@@ -544,24 +544,24 @@
extern void gconf(SCSI *);
if (lverbose > 2)
- gconf(scgp);
+ gconf(usalp);
}
#endif
if ((flags & F_PRCAP) != 0) {
- print_capabilities(scgp);
- print_capabilities_mmc4(scgp);
+ print_capabilities(usalp);
+ print_capabilities_mmc4(usalp);
exit(0);
}
if ((flags & F_INQUIRY) != 0)
exit(0);
if (dp == (cdr_t *)NULL) { /* No driver= option specified */
- dp = get_cdrcmds(scgp); /* Calls dp->cdr_identify() */
- } else if (!is_unknown_dev(scgp) && dp != get_cdrcmds(scgp)) {
+ dp = get_cdrcmds(usalp); /* Calls dp->cdr_identify() */
+ } else if (!is_unknown_dev(usalp) && dp != get_cdrcmds(usalp)) {
errmsgno(EX_BAD, "WARNING: Trying to use other driver on known device.\n");
}
- is_mmc(scgp, &is_cdwr, &is_dvdwr);
+ is_mmc(usalp, &is_cdwr, &is_dvdwr);
if (ispacket) {
if (is_dvdwr) {
track[0].flags |= TI_PACKET;
@@ -587,7 +587,7 @@
}
}
- if (!is_cddrive(scgp))
+ if (!is_cddrive(usalp))
comerrno(EX_BAD, "Sorry, no CD/DVD-Drive found on this target.\n");
/*
* The driver is known, set up data structures...
@@ -620,7 +620,7 @@
"Sorry, no CD/DVD-Recorder or unsupported CD/DVD-Recorder found on this target.\n");
}
- if (!is_mmc(scgp, &is_cdwr, &is_dvdwr))
+ if (!is_mmc(usalp, &is_cdwr, &is_dvdwr))
is_cdwr = TRUE; /* If it is not MMC, it must be a CD writer */
if (is_dvdwr && !set_cdrcmds("mmc_mdvd", (cdr_t **)NULL)) {
@@ -643,7 +643,7 @@
/*
* Set up data structures for current drive state.
*/
- if ((*dp->cdr_attach)(scgp, dp) != 0)
+ if ((*dp->cdr_attach)(usalp, dp) != 0)
comerrno(EX_BAD, "Cannot attach driver for CD/DVD-Recorder.\n");
if (lverbose > 1) {
@@ -661,7 +661,7 @@
}
dp->cdr_dstat->ds_wspeed = speed; /* XXX Remove 'speed' in future */
- exargs.scgp = scgp;
+ exargs.usalp = usalp;
exargs.dp = dp;
exargs.old_secsize = -1;
exargs.flags = flags;
@@ -671,11 +671,11 @@
print_drflags(dp);
print_wrmodes(dp);
}
- scgp->silent++;
+ usalp->silent++;
if ((debug || lverbose)) {
tsize = -1;
- if ((*dp->cdr_buffer_cap)(scgp, &tsize, (long *)0) < 0 || tsize < 0) {
- if (read_buffer(scgp, buf, 4, 0) >= 0)
+ if ((*dp->cdr_buffer_cap)(usalp, &tsize, (long *)0) < 0 || tsize < 0) {
+ if (read_buffer(usalp, buf, 4, 0) >= 0)
tsize = a_to_u_4_byte(buf);
}
if (tsize > 0) {
@@ -683,9 +683,9 @@
tsize, tsize >> 10);
}
}
- scgp->silent--;
+ usalp->silent--;
- dma_speed = get_dmaspeed(scgp, dp);
+ dma_speed = get_dmaspeed(usalp, dp);
if ((debug || lverbose) && dma_speed > 0) {
/*
* We do not yet know what medium type is in...
@@ -708,10 +708,10 @@
/*
* flush cache is not supported by CD-ROMs avoid prob with -toc
*/
- scgp->silent++;
- scsi_flush_cache(scgp, FALSE);
- (*dp->cdr_abort_session)(scgp, dp);
- scgp->silent--;
+ usalp->silent++;
+ scsi_flush_cache(usalp, FALSE);
+ (*dp->cdr_abort_session)(usalp, dp);
+ usalp->silent--;
exit(0);
}
@@ -721,7 +721,7 @@
* Do not check if the unit is ready here to allow to open
* an empty unit too.
*/
- unload_media(scgp, dp, flags);
+ unload_media(usalp, dp, flags);
exit(0);
}
flush();
@@ -796,33 +796,33 @@
on_comerr(exscsi, &exargs);
if ((flags & F_FORCE) == 0)
- load_media(scgp, dp, TRUE);
+ load_media(usalp, dp, TRUE);
if ((flags & (F_LOAD|F_DLCK)) != 0) {
if ((flags & F_DLCK) == 0) {
- scgp->silent++; /* silently */
+ usalp->silent++; /* silently */
scsi_prevent_removal(
- scgp, 0); /* allow manual open */
- scgp->silent--; /* if load failed... */
+ usalp, 0); /* allow manual open */
+ usalp->silent--; /* if load failed... */
}
exit(0); /* we did not change status */
}
- exargs.old_secsize = sense_secsize(scgp, 1);
+ exargs.old_secsize = sense_secsize(usalp, 1);
if (exargs.old_secsize < 0)
- exargs.old_secsize = sense_secsize(scgp, 0);
+ exargs.old_secsize = sense_secsize(usalp, 0);
if (debug)
printf("Current Secsize: %d\n", exargs.old_secsize);
- scgp->silent++;
- if (read_capacity(scgp) < 0) {
+ usalp->silent++;
+ if (read_capacity(usalp) < 0) {
if (exargs.old_secsize > 0)
- scgp->cap->c_bsize = exargs.old_secsize;
+ usalp->cap->c_bsize = exargs.old_secsize;
}
- scgp->silent--;
+ usalp->silent--;
if (exargs.old_secsize < 0)
- exargs.old_secsize = scgp->cap->c_bsize;
- if (exargs.old_secsize != scgp->cap->c_bsize)
+ exargs.old_secsize = usalp->cap->c_bsize;
+ if (exargs.old_secsize != usalp->cap->c_bsize)
errmsgno(EX_BAD, "Warning: blockdesc secsize %d differs from cap secsize %d\n",
- exargs.old_secsize, scgp->cap->c_bsize);
+ exargs.old_secsize, usalp->cap->c_bsize);
if (lverbose)
printf("Current Secsize: %d\n", exargs.old_secsize);
@@ -834,16 +834,16 @@
* In addition, cdrecord -msinfo will not work properly
* if the sector size is not 2048 bytes.
*/
- set_secsize(scgp, DATA_SEC_SIZE);
+ set_secsize(usalp, DATA_SEC_SIZE);
}
/*
* Is this the right place to do this ?
*/
- check_recovery(scgp, dp, flags);
+ check_recovery(usalp, dp, flags);
/*audioread(dp, flags);*/
-/*unload_media(scgp, dp, flags);*/
+/*unload_media(usalp, dp, flags);*/
/*return 0;*/
if (flags & F_WRITE)
dp->cdr_dstat->ds_cdrflags |= RF_WRITE;
@@ -859,7 +859,7 @@
lverbose++;
dp->cdr_dstat->ds_cdrflags |= RF_WR_WAIT;
}
- if ((*dp->cdr_getdisktype)(scgp, dp) < 0) {
+ if ((*dp->cdr_getdisktype)(usalp, dp) < 0) {
errmsgno(EX_BAD, "Cannot get disk type.\n");
if ((flags & F_FORCE) == 0)
comexit(EX_BAD);
@@ -896,24 +896,24 @@
* XXX Will not return from -dummy to non-dummy without
* XXX opening the tray.
*/
- scgp->silent++;
- if ((*dp->cdr_init)(scgp, dp) < 0)
+ usalp->silent++;
+ if ((*dp->cdr_init)(usalp, dp) < 0)
comerrno(EX_BAD, "Cannot init drive.\n");
- scgp->silent--;
+ usalp->silent--;
if (flags & F_SETDROPTS) {
/*
* Note that the set speed function also contains
* drive option processing for speed related drive options.
*/
- if ((*dp->cdr_opt1)(scgp, dp) < 0) {
+ if ((*dp->cdr_opt1)(usalp, dp) < 0) {
errmsgno(EX_BAD, "Cannot set up 1st set of driver options.\n");
}
- if ((*dp->cdr_set_speed_dummy)(scgp, dp, &speed) < 0) {
+ if ((*dp->cdr_set_speed_dummy)(usalp, dp, &speed) < 0) {
errmsgno(EX_BAD, "Cannot set speed/dummy.\n");
}
dp->cdr_dstat->ds_wspeed = speed; /* XXX Remove 'speed' in future */
- if ((*dp->cdr_opt2)(scgp, dp) < 0) {
+ if ((*dp->cdr_opt2)(usalp, dp) < 0) {
errmsgno(EX_BAD, "Cannot set up 2nd set of driver options.\n");
}
comexit(0);
@@ -923,11 +923,11 @@
* XXX the multi session info we would need to move it here.
*/
if (flags & F_MSINFO) {
- print_msinfo(scgp, dp);
+ print_msinfo(usalp, dp);
comexit(0);
}
if (flags & F_TOC) {
- print_toc(scgp, dp);
+ print_toc(usalp, dp);
comexit(0);
}
#ifdef XXX
@@ -938,7 +938,7 @@
{
Int32_t omb = dp->cdr_dstat->ds_maxblocks;
- if ((*dp->cdr_opt1)(scgp, dp) < 0) {
+ if ((*dp->cdr_opt1)(usalp, dp) < 0) {
errmsgno(EX_BAD, "Cannot set up 1st set of driver options.\n");
}
if (tsize > 0 && omb != dp->cdr_dstat->ds_maxblocks) {
@@ -956,7 +956,7 @@
* XXX How do we let the user check the remaining
* XXX disk size witout starting the write process?
*/
- if (!checkdsize(scgp, dp, tsize, flags))
+ if (!checkdsize(usalp, dp, tsize, flags))
comexit(EX_BAD);
}
if (tracks > 0 && fs > 0l) {
@@ -1002,7 +1002,7 @@
#endif
}
- if ((*dp->cdr_set_speed_dummy)(scgp, dp, &speed) < 0) {
+ if ((*dp->cdr_set_speed_dummy)(usalp, dp, &speed) < 0) {
errmsgno(EX_BAD, "Cannot set speed/dummy.\n");
if ((flags & F_FORCE) == 0)
comexit(EX_BAD);
@@ -1120,7 +1120,7 @@
}
if ((flags & (F_BLANK|F_FORCE)) == (F_BLANK|F_FORCE)) {
printf("Waiting for drive to calm down.\n");
- wait_unit_ready(scgp, 120);
+ wait_unit_ready(usalp, 120);
if (gracewait(dp, &gracedone) < 0) {
/*
* In case kill() did not work ;-)
@@ -1128,7 +1128,7 @@
errs++;
goto restore_it;
}
- scsi_blank(scgp, 0L, blanktype, FALSE);
+ scsi_blank(usalp, 0L, blanktype, FALSE);
}
/*
@@ -1144,7 +1144,7 @@
if (dp->profile == 0x2B && flags & F_SAO && tsize > 0) {
printf("Preparing middle zone location for this DVD+R dual layer disc\n");
- if (!dp->cdr_layer_split(scgp, dp, tsize)) {
+ if (!dp->cdr_layer_split(usalp, dp, tsize)) {
errmsgno(EX_BAD, "Cannot send structure for middle zone location.\n");
comexit(EX_BAD);
}
@@ -1162,7 +1162,7 @@
comerrno(EX_BAD, "Input buffer error, aborting.\n");
}
}
- wait_unit_ready(scgp, 120);
+ wait_unit_ready(usalp, 120);
starttime.tv_sec = 0;
wstarttime.tv_sec = 0;
@@ -1183,14 +1183,14 @@
* This is most likely because they refuse to do OPC
* on a non blank media.
*/
- scgp->silent++;
- do_opc(scgp, dp, flags);
- scgp->silent--;
- wait_unit_ready(scgp, 120);
+ usalp->silent++;
+ do_opc(usalp, dp, flags);
+ usalp->silent--;
+ wait_unit_ready(usalp, 120);
if (gettimeofday(&starttime, (struct timezone *)0) < 0)
errmsg("Cannot get start time\n");
- if ((*dp->cdr_blank)(scgp, dp, 0L, blanktype) < 0) {
+ if ((*dp->cdr_blank)(usalp, dp, 0L, blanktype) < 0) {
errmsgno(EX_BAD, "Cannot blank disk, aborting.\n");
if (blanktype != BLANK_DISC) {
errmsgno(EX_BAD, "Some drives do not support all blank types.\n");
@@ -1207,7 +1207,7 @@
* XXX Erst blank und dann format?
* XXX Wenn ja, dann hier (flags & F_FORMAT) testen
*/
- if (!wait_unit_ready(scgp, 240) || tracks == 0) {
+ if (!wait_unit_ready(usalp, 240) || tracks == 0) {
comexit(0);
}
if (flags & F_FORMAT) {
@@ -1220,14 +1220,14 @@
* This is most likely because they refuse to do OPC
* on a non blank media.
*/
- scgp->silent++;
- do_opc(scgp, dp, flags);
- scgp->silent--;
- wait_unit_ready(scgp, 120);
+ usalp->silent++;
+ do_opc(usalp, dp, flags);
+ usalp->silent--;
+ wait_unit_ready(usalp, 120);
if (gettimeofday(&starttime, (struct timezone *)0) < 0)
errmsg("Cannot get start time\n");
- if ((*dp->cdr_format)(scgp, dp, formattype) < 0) {
+ if ((*dp->cdr_format)(usalp, dp, formattype) < 0) {
errmsgno(EX_BAD, "Cannot format disk, aborting.\n");
comexit(EX_BAD);
}
@@ -1236,7 +1236,7 @@
if (lverbose)
prtimediff("Formatting time: ", &starttime, &fixtime);
- if (!wait_unit_ready(scgp, 240) || tracks == 0) {
+ if (!wait_unit_ready(usalp, 240) || tracks == 0) {
comexit(0);
}
if (gettimeofday(&starttime, (struct timezone *)0) < 0)
@@ -1255,11 +1255,11 @@
* Get the number of the next recordable track by reading the TOC and
* use the number the last current track number.
*/
- scgp->silent++;
- if (read_tochdr(scgp, dp, NULL, &trackno) < 0) {
+ usalp->silent++;
+ if (read_tochdr(usalp, dp, NULL, &trackno) < 0) {
trackno = 0;
}
- scgp->silent--;
+ usalp->silent--;
/* If it is DVD, the information in TOC is fabricated :)
The real information is from read disk info command*/
@@ -1281,7 +1281,7 @@
track[i].trackno = i + trackno; /* Set up real track # */
}
- if ((*dp->cdr_opt2)(scgp, dp) < 0) {
+ if ((*dp->cdr_opt2)(usalp, dp) < 0) {
errmsgno(EX_BAD, "Cannot set up 2nd set of driver options.\n");
}
@@ -1289,10 +1289,10 @@
* Now we actually start writing to the CD/DVD.
* XXX Check total size of the tracks and remaining size of disk.
*/
- if ((*dp->cdr_open_session)(scgp, dp, track) < 0) {
+ if ((*dp->cdr_open_session)(usalp, dp, track) < 0) {
comerrno(EX_BAD, "Cannot open new session.\n");
}
- if (!do_opc(scgp, dp, flags))
+ if (!do_opc(usalp, dp, flags))
comexit(EX_BAD);
/*
@@ -1308,7 +1308,7 @@
/*
* This call may modify trackp[i].trackstart for all tracks.
*/
- if ((*dp->cdr_write_leadin)(scgp, dp, track) < 0)
+ if ((*dp->cdr_write_leadin)(usalp, dp, track) < 0)
comerrno(EX_BAD, "Could not write Lead-in.\n");
if (lverbose && (dp->cdr_dstat->ds_cdrflags & RF_LEADIN) != 0) {
@@ -1323,14 +1323,14 @@
for (i = 1; i <= tracks; i++) {
startsec = 0L;
- if ((*dp->cdr_open_track)(scgp, dp, &track[i]) < 0) {
+ if ((*dp->cdr_open_track)(usalp, dp, &track[i]) < 0) {
errmsgno(EX_BAD, "Cannot open next track.\n");
errs++;
break;
}
if ((flags & (F_SAO|F_RAW)) == 0) {
- if ((*dp->cdr_next_wr_address)(scgp, &track[i], &startsec) < 0) {
+ if ((*dp->cdr_next_wr_address)(usalp, &track[i], &startsec) < 0) {
errmsgno(EX_BAD, "Cannot get next writable address.\n");
errs++;
break;
@@ -1342,8 +1342,8 @@
track[i].trackstart);
flush();
}
- if (write_track_data(scgp, dp, &track[i]) < 0) {
- if (cdr_underrun(scgp)) {
+ if (write_track_data(usalp, dp, &track[i]) < 0) {
+ if (cdr_underrun(usalp)) {
errmsgno(EX_BAD,
"The current problem looks like a buffer underrun.\n");
if ((dp->cdr_dstat->ds_cdrflags & RF_BURNFREE) == 0)
@@ -1363,16 +1363,16 @@
}
errs++;
sleep(5);
- unit_ready(scgp);
- (*dp->cdr_close_track)(scgp, dp, &track[i]);
+ unit_ready(usalp);
+ (*dp->cdr_close_track)(usalp, dp, &track[i]);
break;
}
- if ((*dp->cdr_close_track)(scgp, dp, &track[i]) < 0) {
+ if ((*dp->cdr_close_track)(usalp, dp, &track[i]) < 0) {
/*
* Check for "Dummy blocks added" message first.
*/
- if (scg_sense_key(scgp) != SC_ILLEGAL_REQUEST ||
- scg_sense_code(scgp) != 0xB5) {
+ if (usal_sense_key(usalp) != SC_ILLEGAL_REQUEST ||
+ usal_sense_code(usalp) != 0xB5) {
errmsgno(EX_BAD, "Cannot close track.\n");
errs++;
break;
@@ -1389,14 +1389,14 @@
printf("Writing Leadout...\n");
flush();
}
- write_leadout(scgp, dp, track);
+ write_leadout(usalp, dp, track);
}
if ((flags & F_NOFIX) == 0) {
if (lverbose) {
printf("Fixating...\n");
flush();
}
- if ((*dp->cdr_fixate)(scgp, dp, track) < 0) {
+ if ((*dp->cdr_fixate)(usalp, dp, track) < 0) {
/*
* Ignore fixating errors in dummy mode.
*/
@@ -1412,20 +1412,20 @@
}
if ((dp->cdr_dstat->ds_cdrflags & RF_DID_CDRSTAT) == 0) {
dp->cdr_dstat->ds_cdrflags |= RF_DID_CDRSTAT;
- (*dp->cdr_stats)(scgp, dp);
+ (*dp->cdr_stats)(usalp, dp);
}
if ((flags & (F_RAW|F_EJECT)) == F_RAW) {
/*
* Most drives seem to forget to reread the TOC from disk
* if they are in RAW mode.
*/
- scgp->silent++;
- if (read_tochdr(scgp, dp, NULL, NULL) < 0) {
- scgp->silent--;
+ usalp->silent++;
+ if (read_tochdr(usalp, dp, NULL, NULL) < 0) {
+ usalp->silent--;
if ((flags & F_DUMMY) == 0)
- reload_media(scgp, dp);
+ reload_media(usalp, dp);
} else {
- scgp->silent--;
+ usalp->silent--;
}
}
@@ -1749,16 +1749,16 @@
intfifo(int sig)
{
errmsgno(EX_BAD, "Caught interrupt.\n");
- if (exargs.scgp) {
- SCSI *scgp = exargs.scgp;
+ if (exargs.usalp) {
+ SCSI *usalp = exargs.usalp;
- if (scgp->running) {
- if (scgp->cb_fun != NULL) {
+ if (usalp->running) {
+ if (usalp->cb_fun != NULL) {
comerrno(EX_BAD, "Second interrupt. Doing hard abort.\n");
/* NOTREACHED */
}
- scgp->cb_fun = scsi_cb;
- scgp->cb_arg = &exargs;
+ usalp->cb_fun = scsi_cb;
+ usalp->cb_arg = &exargs;
return;
}
}
@@ -1775,18 +1775,18 @@
* Try to restore the old sector size.
*/
if (exp != NULL && exp->exflags == 0) {
- if (exp->scgp->running) {
+ if (exp->usalp->running) {
return;
}
/*
* flush cache is not supported by CD-ROMs avoid prob with -toc
*/
- exp->scgp->silent++;
- scsi_flush_cache(exp->scgp, FALSE);
- (*exp->dp->cdr_abort_session)(exp->scgp, exp->dp);
- exp->scgp->silent--;
- set_secsize(exp->scgp, exp->old_secsize);
- unload_media(exp->scgp, exp->dp, exp->flags);
+ exp->usalp->silent++;
+ scsi_flush_cache(exp->usalp, FALSE);
+ (*exp->dp->cdr_abort_session)(exp->usalp, exp->dp);
+ exp->usalp->silent--;
+ set_secsize(exp->usalp, exp->old_secsize);
+ unload_media(exp->usalp, exp->dp, exp->flags);
exp->exflags++; /* Make sure that it only get called once */
}
@@ -1802,7 +1802,7 @@
cdrstats(exp->dp);
if ((exp->dp->cdr_dstat->ds_cdrflags & RF_DID_CDRSTAT) == 0) {
exp->dp->cdr_dstat->ds_cdrflags |= RF_DID_CDRSTAT;
- (*exp->dp->cdr_stats)(exp->scgp, exp->dp);
+ (*exp->dp->cdr_stats)(exp->usalp, exp->dp);
}
#ifdef FIFO
@@ -1921,17 +1921,17 @@
}
int
-write_secs(SCSI *scgp, cdr_t *dp, char *bp, long startsec, int bytespt,
+write_secs(SCSI *usalp, cdr_t *dp, char *bp, long startsec, int bytespt,
int secspt, BOOL islast)
{
int amount;
again:
- scgp->silent++;
- amount = (*dp->cdr_write_trackdata)(scgp, bp, startsec, bytespt, secspt, islast);
- scgp->silent--;
+ usalp->silent++;
+ amount = (*dp->cdr_write_trackdata)(usalp, bp, startsec, bytespt, secspt, islast);
+ usalp->silent--;
if (amount < 0) {
- if (scsi_in_progress(scgp)) {
+ if (scsi_in_progress(usalp)) {
/*
* If we sleep too long, the drive buffer is empty
* before we start filling it again. The max. CD speed
@@ -1961,7 +1961,7 @@
}
static int
-write_track_data(SCSI *scgp, cdr_t *dp, track_t *trackp)
+write_track_data(SCSI *usalp, cdr_t *dp, track_t *trackp)
{
int track = trackp->trackno;
int f = -1;
@@ -1997,16 +1997,16 @@
if (dp->cdr_dstat->ds_flags & DSF_DVD)
secsps = 676.27;
- scgp->silent++;
- if ((*dp->cdr_buffer_cap)(scgp, &bsize, &bfree) < 0)
+ usalp->silent++;
+ if ((*dp->cdr_buffer_cap)(usalp, &bsize, &bfree) < 0)
bsize = -1L;
if (bsize == 0) /* If we have no (known) buffer, we cannot */
bsize = -1L; /* retrieve the buffer fill ratio */
- scgp->silent--;
+ usalp->silent--;
if (is_packet(trackp)) /* XXX Ugly hack for now */
- return (write_packet_data(scgp, dp, trackp));
+ return (write_packet_data(usalp, dp, trackp));
if (trackp->xfp != NULL)
f = xfileno(trackp->xfp);
@@ -2088,7 +2088,7 @@
islast = TRUE;
}
- amount = write_secs(scgp, dp, bp, startsec, bytespt, secspt, islast);
+ amount = write_secs(usalp, dp, bp, startsec, bytespt, secspt, islast);
if (amount < 0) {
printf("%swrite track data: error after %lld bytes\n",
neednl?"\n":"", bytes);
@@ -2114,9 +2114,9 @@
printf(" (fifo %3d%%)", fper);
#ifdef BCAP
if (bsize > 0) { /* buffer size known */
- scgp->silent++;
- per = (*dp->cdr_buffer_cap)(scgp, (long *)0, &bfree);
- scgp->silent--;
+ usalp->silent++;
+ per = (*dp->cdr_buffer_cap)(usalp, (long *)0, &bfree);
+ usalp->silent--;
if (per >= 0) {
per = 100*(bsize - bfree) / bsize;
if ((bsize - bfree) <= amount || per <= 5)
@@ -2189,7 +2189,7 @@
}
#ifdef XBCAP
if (bsize > 0) { /* buffer size known */
- (*dp->cdr_buffer_cap)(scgp, (long *)0, &bfree);
+ (*dp->cdr_buffer_cap)(usalp, (long *)0, &bfree);
per = 100*(bsize - bfree) / bsize;
if (per != oper)
printf("[buf %3d%%] %3ld %3ld\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b",
@@ -2232,7 +2232,7 @@
track, (Llong)(padbytes >> 10));
neednl = FALSE;
}
- pad_track(scgp, dp, trackp, startsec, padbytes,
+ pad_track(usalp, dp, trackp, startsec, padbytes,
TRUE, &savbytes);
bytes += savbytes;
startsec += savbytes / secsize;
@@ -2244,7 +2244,7 @@
}
int
-pad_track(SCSI *scgp, cdr_t *dp, track_t *trackp, long startsec, Llong amt,
+pad_track(SCSI *usalp, cdr_t *dp, track_t *trackp, long startsec, Llong amt,
BOOL dolast, Llong *bytesp)
{
int track = trackp->trackno;
@@ -2273,12 +2273,12 @@
if (dp->cdr_dstat->ds_flags & DSF_DVD)
secsps = 676.27;
- scgp->silent++;
- if ((*dp->cdr_buffer_cap)(scgp, &bsize, &bfree) < 0)
+ usalp->silent++;
+ if ((*dp->cdr_buffer_cap)(usalp, &bsize, &bfree) < 0)
bsize = -1L;
if (bsize == 0) /* If we have no (known) buffer, we cannot */
bsize = -1L; /* retrieve the buffer fill ratio */
- scgp->silent--;
+ usalp->silent--;
secsize = trackp->secsize;
secspt = trackp->secspt;
@@ -2305,13 +2305,13 @@
fillsubch(trackp, (Uchar *)buf, startsec, secspt);
}
- amount = write_secs(scgp, dp, buf, startsec, bytespt, secspt, islast);
+ amount = write_secs(usalp, dp, buf, startsec, bytespt, secspt, islast);
if (amount < 0) {
printf("%swrite track pad data: error after %lld bytes\n",
neednl?"\n":"", bytes);
if (bytesp)
*bytesp = bytes;
-(*dp->cdr_buffer_cap)(scgp, (long *)0, (long *)0);
+(*dp->cdr_buffer_cap)(usalp, (long *)0, (long *)0);
return (-1);
}
amt -= amount;
@@ -2333,9 +2333,9 @@
#ifdef BCAP
if (bsize > 0) { /* buffer size known */
- scgp->silent++;
- per = (*dp->cdr_buffer_cap)(scgp, (long *)0, &bfree);
- scgp->silent--;
+ usalp->silent++;
+ per = (*dp->cdr_buffer_cap)(usalp, (long *)0, &bfree);
+ usalp->silent--;
if (per >= 0) {
per = 100*(bsize - bfree) / bsize;
if ((bsize - bfree) <= amount || per <= 5)
@@ -2378,7 +2378,7 @@
#ifdef USE_WRITE_BUF
int
-write_buf(SCSI *scgp, cdr_t *dp, track_t *trackp, char *bp, long startsec,
+write_buf(SCSI *usalp, cdr_t *dp, track_t *trackp, char *bp, long startsec,
Llong amt, int secsize, BOOL dolast, Llong *bytesp)
{
int track = trackp->trackno;
@@ -2413,13 +2413,13 @@
if (dolast && (amt - bytespt) <= 0)
islast = TRUE;
- amount = write_secs(scgp, dp, bp, startsec, bytespt, secspt, islast);
+ amount = write_secs(usalp, dp, bp, startsec, bytespt, secspt, islast);
if (amount < 0) {
printf("%swrite track data: error after %ld bytes\n",
neednl?"\n":"", bytes);
if (bytesp)
*bytesp = bytes;
-(*dp->cdr_buffer_cap)(scgp, (long *)0, (long *)0);
+(*dp->cdr_buffer_cap)(usalp, (long *)0, (long *)0);
return (-1);
}
amt -= amount;
@@ -2856,16 +2856,16 @@
}
static BOOL
-checkdsize(SCSI *scgp, cdr_t *dp, long tsize, int flags)
+checkdsize(SCSI *usalp, cdr_t *dp, long tsize, int flags)
{
long startsec = 0L;
long endsec = 0L;
dstat_t *dsp = dp->cdr_dstat;
int profile;
- scgp->silent++;
- (*dp->cdr_next_wr_address)(scgp, (track_t *)0, &startsec);
- scgp->silent--;
+ usalp->silent++;
+ (*dp->cdr_next_wr_address)(usalp, (track_t *)0, &startsec);
+ usalp->silent--;
/*
* This only should happen when the drive is currently in SAO mode.
@@ -3835,7 +3835,7 @@
}
void
-load_media(SCSI *scgp, cdr_t *dp, BOOL doexit)
+load_media(SCSI *usalp, cdr_t *dp, BOOL doexit)
{
int code;
int key;
@@ -3844,22 +3844,22 @@
/*
* Do some preparation before...
*/
- scgp->silent++; /* Be quiet if this fails */
- test_unit_ready(scgp); /* First eat up unit attention */
- if ((*dp->cdr_load)(scgp, dp) < 0) { /* now try to load media and */
+ usalp->silent++; /* Be quiet if this fails */
+ test_unit_ready(usalp); /* First eat up unit attention */
+ if ((*dp->cdr_load)(usalp, dp) < 0) { /* now try to load media and */
if (!doexit)
return;
comerrno(EX_BAD, "Cannot load media.\n");
}
- scsi_start_stop_unit(scgp, 1, 0, immed); /* start unit in silent mode */
- scgp->silent--;
+ scsi_start_stop_unit(usalp, 1, 0, immed); /* start unit in silent mode */
+ usalp->silent--;
- if (!wait_unit_ready(scgp, 60)) {
- code = scg_sense_code(scgp);
- key = scg_sense_key(scgp);
- scgp->silent++;
- scsi_prevent_removal(scgp, 0); /* In case someone locked it */
- scgp->silent--;
+ if (!wait_unit_ready(usalp, 60)) {
+ code = usal_sense_code(usalp);
+ key = usal_sense_key(usalp);
+ usalp->silent++;
+ scsi_prevent_removal(usalp, 0); /* In case someone locked it */
+ usalp->silent--;
if (!doexit)
return;
@@ -3868,30 +3868,30 @@
comerrno(EX_BAD, "CD/DVD-Recorder not ready.\n");
}
- scsi_prevent_removal(scgp, 1);
- scsi_start_stop_unit(scgp, 1, 0, immed);
- wait_unit_ready(scgp, 120);
- scgp->silent++;
+ scsi_prevent_removal(usalp, 1);
+ scsi_start_stop_unit(usalp, 1, 0, immed);
+ wait_unit_ready(usalp, 120);
+ usalp->silent++;
if(geteuid() == 0) /* EB: needed? Not allowed for non-root, that is sure. */
- rezero_unit(scgp); /* Is this needed? Not supported by some drvives */
- scgp->silent--;
- test_unit_ready(scgp);
- scsi_start_stop_unit(scgp, 1, 0, immed);
- wait_unit_ready(scgp, 120);
+ rezero_unit(usalp); /* Is this needed? Not supported by some drvives */
+ usalp->silent--;
+ test_unit_ready(usalp);
+ scsi_start_stop_unit(usalp, 1, 0, immed);
+ wait_unit_ready(usalp, 120);
}
void
-unload_media(SCSI *scgp, cdr_t *dp, int flags)
+unload_media(SCSI *usalp, cdr_t *dp, int flags)
{
- scsi_prevent_removal(scgp, 0);
+ scsi_prevent_removal(usalp, 0);
if ((flags & F_EJECT) != 0) {
- if ((*dp->cdr_unload)(scgp, dp) < 0)
+ if ((*dp->cdr_unload)(usalp, dp) < 0)
errmsgno(EX_BAD, "Cannot eject media.\n");
}
}
void
-reload_media(SCSI *scgp, cdr_t *dp)
+reload_media(SCSI *usalp, cdr_t *dp)
{
char ans[2];
#ifdef F_GETFL
@@ -3899,20 +3899,20 @@
#endif
errmsgno(EX_BAD, "Drive needs to reload the media to return to proper status.\n");
- unload_media(scgp, dp, F_EJECT);
+ unload_media(usalp, dp, F_EJECT);
/*
* Note that even Notebook drives identify as CDR_TRAYLOAD
*/
if ((dp->cdr_flags & CDR_TRAYLOAD) != 0) {
- scgp->silent++;
- load_media(scgp, dp, FALSE);
- scgp->silent--;
+ usalp->silent++;
+ load_media(usalp, dp, FALSE);
+ usalp->silent--;
}
- scgp->silent++;
+ usalp->silent++;
if (((dp->cdr_flags & CDR_TRAYLOAD) == 0) ||
- !wait_unit_ready(scgp, 5)) {
+ !wait_unit_ready(usalp, 5)) {
static FILE *tty = NULL;
printf("Re-load disk and hit <CR>");
@@ -3940,26 +3940,26 @@
if (fgetline(tty, ans, 1) < 0)
comerrno(EX_BAD, "Aborted by EOF on input.\n");
}
- scgp->silent--;
+ usalp->silent--;
- load_media(scgp, dp, TRUE);
+ load_media(usalp, dp, TRUE);
}
void
-set_secsize(SCSI *scgp, int secsize)
+set_secsize(SCSI *usalp, int secsize)
{
if (secsize > 0) {
/*
* Try to restore the old sector size.
*/
- scgp->silent++;
- select_secsize(scgp, secsize);
- scgp->silent--;
+ usalp->silent++;
+ select_secsize(usalp, secsize);
+ usalp->silent--;
}
}
static int
-get_dmaspeed(SCSI *scgp, cdr_t *dp)
+get_dmaspeed(SCSI *usalp, cdr_t *dp)
{
int i;
long t;
@@ -3976,9 +3976,9 @@
fillbytes((caddr_t)buf, 4, '\0');
tsize = 0;
- scgp->silent++;
- i = read_buffer(scgp, buf, 4, 0);
- scgp->silent--;
+ usalp->silent++;
+ i = read_buffer(usalp, buf, 4, 0);
+ usalp->silent--;
if (i < 0)
return (-1);
tsize = a_to_u_4_byte(buf);
@@ -3992,7 +3992,7 @@
if (tsize < bs)
bs = tsize;
for (i = 0; i < 100; i++) {
- if (read_buffer(scgp, buf, bs, 0) < 0)
+ if (read_buffer(usalp, buf, bs, 0) < 0)
return (-1);
}
if (gettimeofday(&fixtime, (struct timezone *)0) < 0) {
@@ -4014,14 +4014,14 @@
static BOOL
-do_opc(SCSI *scgp, cdr_t *dp, int flags)
+do_opc(SCSI *usalp, cdr_t *dp, int flags)
{
if ((flags & F_DUMMY) == 0 && dp->cdr_opc) {
if (debug || lverbose) {
printf("Performing OPC...\n");
flush();
}
- if (dp->cdr_opc(scgp, NULL, 0, TRUE) < 0) {
+ if (dp->cdr_opc(usalp, NULL, 0, TRUE) < 0) {
errmsgno(EX_BAD, "OPC failed.\n");
if ((flags & F_FORCE) == 0)
return (FALSE);
@@ -4031,11 +4031,11 @@
}
static void
-check_recovery(SCSI *scgp, cdr_t *dp, int flags)
+check_recovery(SCSI *usalp, cdr_t *dp, int flags)
{
- if ((*dp->cdr_check_recovery)(scgp, dp)) {
+ if ((*dp->cdr_check_recovery)(usalp, dp)) {
errmsgno(EX_BAD, "Recovery needed.\n");
- unload_media(scgp, dp, flags);
+ unload_media(usalp, dp, flags);
comexit(EX_BAD);
}
}
@@ -4044,44 +4044,44 @@
#define DEBUG
#endif
void
-audioread(SCSI *scgp, cdr_t *dp, int flags)
+audioread(SCSI *usalp, cdr_t *dp, int flags)
{
#ifdef DEBUG
int speed = 1;
int oflags = dp->cdr_cmdflags;
dp->cdr_cmdflags &= ~F_DUMMY;
- if ((*dp->cdr_set_speed_dummy)(scgp, dp, &speed) < 0)
+ if ((*dp->cdr_set_speed_dummy)(usalp, dp, &speed) < 0)
comexit(-1);
dp->cdr_dstat->ds_wspeed = speed; /* XXX Remove 'speed' in future */
dp->cdr_cmdflags = oflags;
- if ((*dp->cdr_set_secsize)(scgp, 2352) < 0)
+ if ((*dp->cdr_set_secsize)(usalp, 2352) < 0)
comexit(-1);
- scgp->cap->c_bsize = 2352;
+ usalp->cap->c_bsize = 2352;
- read_scsi(scgp, buf, 1000, 1);
+ read_scsi(usalp, buf, 1000, 1);
printf("XXX:\n");
write(1, buf, 512);
- unload_media(scgp, dp, flags);
+ unload_media(usalp, dp, flags);
comexit(0);
#endif
}
static void
-print_msinfo(SCSI *scgp, cdr_t *dp)
+print_msinfo(SCSI *usalp, cdr_t *dp)
{
long off;
long fa;
- if ((*dp->cdr_session_offset)(scgp, &off) < 0) {
+ if ((*dp->cdr_session_offset)(usalp, &off) < 0) {
errmsgno(EX_BAD, "Cannot read session offset\n");
return;
}
if (lverbose)
printf("session offset: %ld\n", off);
- if (dp->cdr_next_wr_address(scgp, (track_t *)0, &fa) < 0) {
+ if (dp->cdr_next_wr_address(usalp, (track_t *)0, &fa) < 0) {
errmsgno(EX_BAD, "Cannot read first writable address\n");
return;
}
@@ -4089,7 +4089,7 @@
}
static void
-print_toc(SCSI *scgp, cdr_t *dp)
+print_toc(SCSI *usalp, cdr_t *dp)
{
int first;
int last;
@@ -4101,20 +4101,20 @@
int mode;
int i;
- scgp->silent++;
- if (read_capacity(scgp) < 0) {
- scgp->silent--;
+ usalp->silent++;
+ if (read_capacity(usalp) < 0) {
+ usalp->silent--;
errmsgno(EX_BAD, "Cannot read capacity\n");
return;
}
- scgp->silent--;
- if (read_tochdr(scgp, dp, &first, &last) < 0) {
+ usalp->silent--;
+ if (read_tochdr(usalp, dp, &first, &last) < 0) {
errmsgno(EX_BAD, "Cannot read TOC/PMA\n");
return;
}
printf("first: %d last %d\n", first, last);
for (i = first; i <= last; i++) {
- read_trackinfo(scgp, i, &lba, &msf, &adr, &control, &mode);
+ read_trackinfo(usalp, i, &lba, &msf, &adr, &control, &mode);
xlba = -150 +
msf.msf_frame + (75*msf.msf_sec) + (75*60*msf.msf_min);
if (xlba == lba/4)
@@ -4122,17 +4122,17 @@
print_track(i, lba, &msf, adr, control, mode);
}
i = 0xAA;
- read_trackinfo(scgp, i, &lba, &msf, &adr, &control, &mode);
+ read_trackinfo(usalp, i, &lba, &msf, &adr, &control, &mode);
xlba = -150 +
msf.msf_frame + (75*msf.msf_sec) + (75*60*msf.msf_min);
if (xlba == lba/4)
lba = xlba;
print_track(i, lba, &msf, adr, control, mode);
if (lverbose > 1) {
- scgp->silent++;
- if (read_cdtext(scgp) < 0)
+ usalp->silent++;
+ if (read_cdtext(usalp) < 0)
errmsgno(EX_BAD, "No CD-Text or CD-Text unaware drive.\n");
- scgp->silent++;
+ usalp->silent++;
}
}
Modified: cdrkit/trunk/wodim/wodim.h
===================================================================
--- cdrkit/trunk/wodim/wodim.h 2006-11-23 11:46:30 UTC (rev 429)
+++ cdrkit/trunk/wodim/wodim.h 2006-11-23 18:57:28 UTC (rev 430)
@@ -690,7 +690,7 @@
* cdr_init() set TAO for -msinfo
* cdr_check_session XXX ????
* cdr_opt1() set early options
- * cdr_set_speed_dummy(scgp, dp, &speed)
+ * cdr_set_speed_dummy(usalp, dp, &speed)
* <--- Grace time processing goes here
* { do_opc(); cdr_blank() }
* cdr_opt2() set late options
@@ -725,71 +725,71 @@
dstat_t *cdr_dstat;
#ifdef _SCG_SCSIREG_H
/* identify drive */
- cdr_t *(*cdr_identify)(SCSI *scgp, cdr_t *, struct scsi_inquiry *);
+ cdr_t *(*cdr_identify)(SCSI *usalp, cdr_t *, struct scsi_inquiry *);
#else
/* identify drive */
- cdr_t *(*cdr_identify)(SCSI *scgp, cdr_t *, void *);
+ cdr_t *(*cdr_identify)(SCSI *usalp, cdr_t *, void *);
#endif
/* init error decoding etc*/
- int (*cdr_attach)(SCSI *scgp, cdr_t *);
+ int (*cdr_attach)(SCSI *usalp, cdr_t *);
/* init drive to useful deflts */
- int (*cdr_init)(SCSI *scgp, cdr_t *);
+ int (*cdr_init)(SCSI *usalp, cdr_t *);
/* get disk type */
- int (*cdr_getdisktype)(SCSI *scgp, cdr_t *);
+ int (*cdr_getdisktype)(SCSI *usalp, cdr_t *);
/* load disk */
- int (*cdr_load)(SCSI *scgp, cdr_t *);
+ int (*cdr_load)(SCSI *usalp, cdr_t *);
/* unload disk */
- int (*cdr_unload)(SCSI *scgp, cdr_t *);
+ int (*cdr_unload)(SCSI *usalp, cdr_t *);
/* read buffer capacity */
- int (*cdr_buffer_cap)(SCSI *scgp, long *sizep, long *freep);
+ int (*cdr_buffer_cap)(SCSI *usalp, long *sizep, long *freep);
/* check if recover is needed */
- int (*cdr_check_recovery)(SCSI *scgp, cdr_t *);
+ int (*cdr_check_recovery)(SCSI *usalp, cdr_t *);
/* do recover */
- int (*cdr_recover)(SCSI *scgp, cdr_t *, int track);
+ int (*cdr_recover)(SCSI *usalp, cdr_t *, int track);
/* set recording speed & dummy write */
- int (*cdr_set_speed_dummy)(SCSI *scgp, cdr_t *, int *speedp);
+ int (*cdr_set_speed_dummy)(SCSI *usalp, cdr_t *, int *speedp);
/* set sector size */
- int (*cdr_set_secsize)(SCSI *scgp, int secsize);
+ int (*cdr_set_secsize)(SCSI *usalp, int secsize);
/* get next writable addr. */
- int (*cdr_next_wr_address)(SCSI *scgp, track_t *trackp, long *ap);
+ int (*cdr_next_wr_address)(SCSI *usalp, track_t *trackp, long *ap);
/* reserve track for future use */
- int (*cdr_reserve_track)(SCSI *scgp, Ulong len);
- int (*cdr_write_trackdata)(SCSI *scgp, caddr_t buf, long daddr, long bytecnt,
+ int (*cdr_reserve_track)(SCSI *usalp, Ulong len);
+ int (*cdr_write_trackdata)(SCSI *usalp, caddr_t buf, long daddr, long bytecnt,
int seccnt, BOOL islast);
/* generate cue sheet */
int (*cdr_gen_cue)(track_t *trackp, void *cuep, BOOL needgap);
/* send cue sheet */
- int (*cdr_send_cue)(SCSI *scgp, cdr_t *, track_t *trackp);
+ int (*cdr_send_cue)(SCSI *usalp, cdr_t *, track_t *trackp);
/* write leadin */
- int (*cdr_write_leadin)(SCSI *scgp, cdr_t *, track_t *trackp);
+ int (*cdr_write_leadin)(SCSI *usalp, cdr_t *, track_t *trackp);
/* open new track */
- int (*cdr_open_track)(SCSI *scgp, cdr_t *, track_t *trackp);
+ int (*cdr_open_track)(SCSI *usalp, cdr_t *, track_t *trackp);
/* close written track */
- int (*cdr_close_track)(SCSI *scgp, cdr_t *, track_t *trackp);
+ int (*cdr_close_track)(SCSI *usalp, cdr_t *, track_t *trackp);
/* open new session */
- int (*cdr_open_session)(SCSI *scgp, cdr_t *, track_t *trackp);
+ int (*cdr_open_session)(SCSI *usalp, cdr_t *, track_t *trackp);
/* really needed ??? */
- int (*cdr_close_session)(SCSI *scgp, cdr_t *);
+ int (*cdr_close_session)(SCSI *usalp, cdr_t *);
/* abort current write */
- int (*cdr_abort_session)(SCSI *scgp, cdr_t *);
+ int (*cdr_abort_session)(SCSI *usalp, cdr_t *);
/* read session offset*/
- int (*cdr_session_offset)(SCSI *scgp, long *soff);
+ int (*cdr_session_offset)(SCSI *usalp, long *soff);
/* write toc on disk */
- int (*cdr_fixate)(SCSI *scgp, cdr_t *, track_t *trackp);
+ int (*cdr_fixate)(SCSI *usalp, cdr_t *, track_t *trackp);
/* final statistics printing*/
- int (*cdr_stats)(SCSI *scgp, cdr_t *);
+ int (*cdr_stats)(SCSI *usalp, cdr_t *);
/* blank something */
- int (*cdr_blank)(SCSI *scgp, cdr_t *, long addr, int blanktype);
+ int (*cdr_blank)(SCSI *usalp, cdr_t *, long addr, int blanktype);
/* format media */
- int (*cdr_format)(SCSI *scgp, cdr_t *, int fmtflags);
+ int (*cdr_format)(SCSI *usalp, cdr_t *, int fmtflags);
/* Do OPC */
- int (*cdr_opc)(SCSI *scgp, caddr_t bp, int cnt, int doopc);
+ int (*cdr_opc)(SCSI *usalp, caddr_t bp, int cnt, int doopc);
/* do early option processing*/
- int (*cdr_opt1)(SCSI *scgp, cdr_t *);
+ int (*cdr_opt1)(SCSI *usalp, cdr_t *);
/* do late option processing */
- int (*cdr_opt2)(SCSI *scgp, cdr_t *);
+ int (*cdr_opt2)(SCSI *usalp, cdr_t *);
/* calculate optimale split */
- int (*cdr_layer_split)(SCSI *scgp, cdr_t *, long tsize);
+ int (*cdr_layer_split)(SCSI *usalp, cdr_t *, long tsize);
int profile;
BOOL is_dvd;
};
@@ -852,14 +852,14 @@
extern int fill_buf(int f, track_t *trackp, long secno, char *bp, int size);
extern int get_buf(int f, track_t *trackp, long secno, char **bpp, int size);
#ifdef _SCG_SCSITRANSP_H
-extern int write_secs(SCSI *scgp, cdr_t *dp, char *bp, long startsec,
+extern int write_secs(SCSI *usalp, cdr_t *dp, char *bp, long startsec,
int bytespt, int secspt, BOOL islast);
-extern int pad_track(SCSI *scgp, cdr_t *dp, track_t *trackp,
+extern int pad_track(SCSI *usalp, cdr_t *dp, track_t *trackp,
long startsec, Llong amt,
BOOL dolast, Llong *bytesp);
-extern void load_media(SCSI *scgp, cdr_t *, BOOL);
-extern void unload_media(SCSI *scgp, cdr_t *, int);
-extern void reload_media(SCSI *scgp, cdr_t *);
+extern void load_media(SCSI *usalp, cdr_t *, BOOL);
+extern void unload_media(SCSI *usalp, cdr_t *, int);
+extern void reload_media(SCSI *usalp, cdr_t *);
#endif
extern void raisepri(int);
extern int getnum(char *arg, long *valp);
@@ -891,32 +891,32 @@
* wm_session.c
*/
#ifdef _SCG_SCSITRANSP_H
-extern int write_session_data(SCSI *scgp, cdr_t *dp, track_t *trackp);
+extern int write_session_data(SCSI *usalp, cdr_t *dp, track_t *trackp);
#endif
/*
* wm_track.c
*/
#ifdef _SCG_SCSITRANSP_H
-/*extern int write_track_data __PR((SCSI *scgp, cdr_t *dp, track_t *trackp));*/
+/*extern int write_track_data __PR((SCSI *usalp, cdr_t *dp, track_t *trackp));*/
#endif
/*
* wm_packet.c
*/
#ifdef _SCG_SCSITRANSP_H
-extern int write_packet_data(SCSI *scgp, cdr_t *dp, track_t *trackp);
+extern int write_packet_data(SCSI *usalp, cdr_t *dp, track_t *trackp);
#endif
/*
* modes.c
*/
#ifdef _SCG_SCSITRANSP_H
-extern BOOL get_mode_params(SCSI *scgp, int page, char *pagename,
+extern BOOL get_mode_params(SCSI *usalp, int page, char *pagename,
Uchar *modep, Uchar *cmodep,
Uchar *dmodep, Uchar *smodep,
int *lenp);
-extern BOOL set_mode_params(SCSI *scgp, char *pagename, Uchar *modep,
+extern BOOL set_mode_params(SCSI *usalp, char *pagename, Uchar *modep,
int len, int save, int secsize);
#endif
@@ -939,59 +939,59 @@
* scsi_cdr.c
*/
#ifdef _SCG_SCSITRANSP_H
-extern BOOL unit_ready(SCSI *scgp);
-extern BOOL wait_unit_ready(SCSI *scgp, int secs);
-extern BOOL scsi_in_progress(SCSI *scgp);
-extern BOOL cdr_underrun(SCSI *scgp);
-extern int test_unit_ready(SCSI *scgp);
-extern int rezero_unit(SCSI *scgp);
-extern int request_sense(SCSI *scgp);
-extern int request_sense_b(SCSI *scgp, caddr_t bp, int cnt);
-extern int inquiry(SCSI *scgp, caddr_t, int);
-extern int read_capacity(SCSI *scgp);
+extern BOOL unit_ready(SCSI *usalp);
+extern BOOL wait_unit_ready(SCSI *usalp, int secs);
+extern BOOL scsi_in_progress(SCSI *usalp);
+extern BOOL cdr_underrun(SCSI *usalp);
+extern int test_unit_ready(SCSI *usalp);
+extern int rezero_unit(SCSI *usalp);
+extern int request_sense(SCSI *usalp);
+extern int request_sense_b(SCSI *usalp, caddr_t bp, int cnt);
+extern int inquiry(SCSI *usalp, caddr_t, int);
+extern int read_capacity(SCSI *usalp);
#ifdef EOF /* stdio.h has been included */
-extern void print_capacity(SCSI *scgp, FILE *f);
+extern void print_capacity(SCSI *usalp, FILE *f);
#endif
-extern int scsi_load_unload(SCSI *scgp, int);
-extern int scsi_prevent_removal(SCSI *scgp, int);
-extern int scsi_start_stop_unit(SCSI *scgp, int, int, BOOL immed);
+extern int scsi_load_unload(SCSI *usalp, int);
+extern int scsi_prevent_removal(SCSI *usalp, int);
+extern int scsi_start_stop_unit(SCSI *usalp, int, int, BOOL immed);
#define ROTCTL_CLV 0 /* CLV or PCAV */
#define ROTCTL_CAV 1 /* True CAV */
-extern int scsi_set_speed(SCSI *scgp, int readspeed, int writespeed,
+extern int scsi_set_speed(SCSI *usalp, int readspeed, int writespeed,
int rotctl);
-extern int scsi_get_speed(SCSI *scgp, int *readspeedp, int *writespeedp);
-extern int qic02(SCSI *scgp, int);
-extern int write_xscsi(SCSI *scgp, caddr_t, long, long, int);
-extern int write_xg0(SCSI *scgp, caddr_t, long, long, int);
-extern int write_xg1(SCSI *scgp, caddr_t, long, long, int);
-extern int write_xg5(SCSI *scgp, caddr_t, long, long, int);
-extern int seek_scsi(SCSI *scgp, long addr);
-extern int seek_g0(SCSI *scgp, long addr);
-extern int seek_g1(SCSI *scgp, long addr);
-extern int scsi_flush_cache(SCSI *scgp, BOOL immed);
-extern int read_buffer(SCSI *scgp, caddr_t bp, int cnt, int mode);
-extern int write_buffer(SCSI *scgp, char *buffer, long length, int mode,
+extern int scsi_get_speed(SCSI *usalp, int *readspeedp, int *writespeedp);
+extern int qic02(SCSI *usalp, int);
+extern int write_xscsi(SCSI *usalp, caddr_t, long, long, int);
+extern int write_xg0(SCSI *usalp, caddr_t, long, long, int);
+extern int write_xg1(SCSI *usalp, caddr_t, long, long, int);
+extern int write_xg5(SCSI *usalp, caddr_t, long, long, int);
+extern int seek_scsi(SCSI *usalp, long addr);
+extern int seek_g0(SCSI *usalp, long addr);
+extern int seek_g1(SCSI *usalp, long addr);
+extern int scsi_flush_cache(SCSI *usalp, BOOL immed);
+extern int read_buffer(SCSI *usalp, caddr_t bp, int cnt, int mode);
+extern int write_buffer(SCSI *usalp, char *buffer, long length, int mode,
int bufferid, long offset);
-extern int read_subchannel(SCSI *scgp, caddr_t bp, int track, int cnt,
+extern int read_subchannel(SCSI *usalp, caddr_t bp, int track, int cnt,
int msf, int subq, int fmt);
-extern int read_toc(SCSI *scgp, caddr_t, int, int, int, int);
-extern int read_toc_philips(SCSI *scgp, caddr_t, int, int, int, int);
-extern int read_header(SCSI *scgp, caddr_t, long, int, int);
-extern int read_disk_info(SCSI *scgp, caddr_t, int);
+extern int read_toc(SCSI *usalp, caddr_t, int, int, int, int);
+extern int read_toc_philips(SCSI *usalp, caddr_t, int, int, int, int);
+extern int read_header(SCSI *usalp, caddr_t, long, int, int);
+extern int read_disk_info(SCSI *usalp, caddr_t, int);
#define TI_TYPE_LBA 0 /* Address is LBA */
#define TI_TYPE_TRACK 1 /* Address: 0 -> TOC, xx -> Track xx, 0xFF -> Inv Track */
#define TI_TYPE_SESS 2 /* Address is session # */
-extern int read_track_info(SCSI *scgp, caddr_t, int type, int addr, int cnt);
-extern int read_rzone_info(SCSI *scgp, caddr_t bp, int cnt);
-extern int reserve_tr_rzone(SCSI *scgp, long size);
-extern int read_dvd_structure(SCSI *scgp, caddr_t bp, int cnt, int addr,
+extern int read_track_info(SCSI *usalp, caddr_t, int type, int addr, int cnt);
+extern int read_rzone_info(SCSI *usalp, caddr_t bp, int cnt);
+extern int reserve_tr_rzone(SCSI *usalp, long size);
+extern int read_dvd_structure(SCSI *usalp, caddr_t bp, int cnt, int addr,
int layer, int fmt);
-extern int send_dvd_structure(SCSI *scgp, caddr_t bp, int cnt, int layer,
+extern int send_dvd_structure(SCSI *usalp, caddr_t bp, int cnt, int layer,
int fmt);
-extern int send_opc(SCSI *scgp, caddr_t, int cnt, int doopc);
+extern int send_opc(SCSI *usalp, caddr_t, int cnt, int doopc);
#define CL_TYPE_STOP_DEICE 0 /* Stop De-icing a DVD+RW Media */
#define CL_TYPE_TRACK 1 /* Close Track # */
@@ -1000,73 +1000,73 @@
#define CL_TYPE_OPEN_SESSION 4 /* Close the Open Session and Record an Extended lead-out */
#define CL_TYPE_FINALISE_MINRAD 5 /* Finalize the Disc with a Minimum Recorded Radius */
#define CL_TYPE_FINALISE 6 /* Finalize the disc */
-extern int scsi_close_tr_session(SCSI *scgp, int type, int track,
+extern int scsi_close_tr_session(SCSI *usalp, int type, int track,
BOOL immed);
-extern int read_master_cue(SCSI *scgp, caddr_t bp, int sheet, int cnt);
-extern int send_cue_sheet(SCSI *scgp, caddr_t bp, long size);
-extern int read_buff_cap(SCSI *scgp, long *, long *);
-extern int scsi_blank(SCSI *scgp, long addr, int blanktype, BOOL immed);
-extern BOOL allow_atapi(SCSI *scgp, BOOL new);
-extern int mode_select(SCSI *scgp, Uchar *, int, int, int);
-extern int mode_sense(SCSI *scgp, Uchar *dp, int cnt, int page, int pcf);
-extern int mode_select_sg0(SCSI *scgp, Uchar *, int, int, int);
-extern int mode_sense_sg0(SCSI *scgp, Uchar *dp, int cnt, int page, int pcf);
-extern int mode_select_g0(SCSI *scgp, Uchar *, int, int, int);
-extern int mode_select_g1(SCSI *scgp, Uchar *, int, int, int);
-extern int mode_sense_g0(SCSI *scgp, Uchar *dp, int cnt, int page, int pcf);
-extern int mode_sense_g1(SCSI *scgp, Uchar *dp, int cnt, int page, int pcf);
-extern int read_tochdr(SCSI *scgp, cdr_t *, int *, int *);
-extern int read_cdtext(SCSI *scgp);
-extern int read_trackinfo(SCSI *scgp, int, long *, struct msf *, int *,
+extern int read_master_cue(SCSI *usalp, caddr_t bp, int sheet, int cnt);
+extern int send_cue_sheet(SCSI *usalp, caddr_t bp, long size);
+extern int read_buff_cap(SCSI *usalp, long *, long *);
+extern int scsi_blank(SCSI *usalp, long addr, int blanktype, BOOL immed);
+extern BOOL allow_atapi(SCSI *usalp, BOOL new);
+extern int mode_select(SCSI *usalp, Uchar *, int, int, int);
+extern int mode_sense(SCSI *usalp, Uchar *dp, int cnt, int page, int pcf);
+extern int mode_select_sg0(SCSI *usalp, Uchar *, int, int, int);
+extern int mode_sense_sg0(SCSI *usalp, Uchar *dp, int cnt, int page, int pcf);
+extern int mode_select_g0(SCSI *usalp, Uchar *, int, int, int);
+extern int mode_select_g1(SCSI *usalp, Uchar *, int, int, int);
+extern int mode_sense_g0(SCSI *usalp, Uchar *dp, int cnt, int page, int pcf);
+extern int mode_sense_g1(SCSI *usalp, Uchar *dp, int cnt, int page, int pcf);
+extern int read_tochdr(SCSI *usalp, cdr_t *, int *, int *);
+extern int read_cdtext(SCSI *usalp);
+extern int read_trackinfo(SCSI *usalp, int, long *, struct msf *, int *,
int *, int *);
-extern int read_B0(SCSI *scgp, BOOL isbcd, long *b0p, long *lop);
-extern int read_session_offset(SCSI *scgp, long *);
-extern int read_session_offset_philips(SCSI *scgp, long *);
-extern int sense_secsize(SCSI *scgp, int current);
-extern int select_secsize(SCSI *scgp, int);
-extern BOOL is_cddrive(SCSI *scgp);
-extern BOOL is_unknown_dev(SCSI *scgp);
-extern int read_scsi(SCSI *scgp, caddr_t, long, int);
-extern int read_g0(SCSI *scgp, caddr_t, long, int);
-extern int read_g1(SCSI *scgp, caddr_t, long, int);
-extern BOOL getdev(SCSI *scgp, BOOL);
+extern int read_B0(SCSI *usalp, BOOL isbcd, long *b0p, long *lop);
+extern int read_session_offset(SCSI *usalp, long *);
+extern int read_session_offset_philips(SCSI *usalp, long *);
+extern int sense_secsize(SCSI *usalp, int current);
+extern int select_secsize(SCSI *usalp, int);
+extern BOOL is_cddrive(SCSI *usalp);
+extern BOOL is_unknown_dev(SCSI *usalp);
+extern int read_scsi(SCSI *usalp, caddr_t, long, int);
+extern int read_g0(SCSI *usalp, caddr_t, long, int);
+extern int read_g1(SCSI *usalp, caddr_t, long, int);
+extern BOOL getdev(SCSI *usalp, BOOL);
#ifdef EOF /* stdio.h has been included */
-extern void printinq(SCSI *scgp, FILE *f);
+extern void printinq(SCSI *usalp, FILE *f);
#endif
-extern void printdev(SCSI *scgp);
-extern BOOL do_inquiry(SCSI *scgp, BOOL);
-extern BOOL recovery_needed(SCSI *scgp, cdr_t *);
-extern int scsi_load(SCSI *scgp, cdr_t *);
-extern int scsi_unload(SCSI *scgp, cdr_t *);
-extern int scsi_cdr_write(SCSI *scgp, caddr_t bp, long sectaddr,
+extern void printdev(SCSI *usalp);
+extern BOOL do_inquiry(SCSI *usalp, BOOL);
+extern BOOL recovery_needed(SCSI *usalp, cdr_t *);
+extern int scsi_load(SCSI *usalp, cdr_t *);
+extern int scsi_unload(SCSI *usalp, cdr_t *);
+extern int scsi_cdr_write(SCSI *usalp, caddr_t bp, long sectaddr,
long size, int blocks, BOOL islast);
-extern struct cd_mode_page_2A *mmc_cap(SCSI *scgp, Uchar *modep);
+extern struct cd_mode_page_2A *mmc_cap(SCSI *usalp, Uchar *modep);
extern void mmc_getval(struct cd_mode_page_2A *mp, BOOL *cdrrp, BOOL *cdwrp,
BOOL *cdrrwp, BOOL *cdwrwp, BOOL *dvdp, BOOL *dvdwp);
-extern BOOL is_mmc(SCSI *scgp, BOOL *cdwp, BOOL *dvdwp);
-extern BOOL mmc_check(SCSI *scgp, BOOL *cdrrp, BOOL *cdwrp, BOOL *cdrrwp,
+extern BOOL is_mmc(SCSI *usalp, BOOL *cdwp, BOOL *dvdwp);
+extern BOOL mmc_check(SCSI *usalp, BOOL *cdrrp, BOOL *cdwrp, BOOL *cdrrwp,
BOOL *cdwrwp, BOOL *dvdp, BOOL *dvdwp);
-extern void print_capabilities(SCSI *scgp);
+extern void print_capabilities(SCSI *usalp);
#endif
/*
* scsi_cdr.c
*/
#ifdef _SCG_SCSITRANSP_H
-extern void print_capabilities_mmc4(SCSI *scgp);
+extern void print_capabilities_mmc4(SCSI *usalp);
#endif
/*
* scsi_mmc.c
*/
#ifdef _SCG_SCSITRANSP_H
-extern int get_configuration(SCSI *scgp, caddr_t bp, int cnt,
+extern int get_configuration(SCSI *usalp, caddr_t bp, int cnt,
int st_feature, int rt);
-extern int get_curprofile(SCSI *scgp);
-extern int print_profiles(SCSI *scgp);
-extern int get_proflist(SCSI *scgp, BOOL *wp, BOOL *cdp, BOOL *dvdp,
+extern int get_curprofile(SCSI *usalp);
+extern int print_profiles(SCSI *usalp);
+extern int get_proflist(SCSI *usalp, BOOL *wp, BOOL *cdp, BOOL *dvdp,
BOOL *dvdplusp, BOOL *ddcdp);
-extern int get_wproflist(SCSI *scgp, BOOL *cdp, BOOL *dvdp,
+extern int get_wproflist(SCSI *usalp, BOOL *cdp, BOOL *dvdp,
BOOL *dvdplusp, BOOL *ddcdp);
#endif
@@ -1074,14 +1074,14 @@
* scsi_mmc.c
*/
#ifdef _SCG_SCSITRANSP_H
-extern int get_supported_cdrw_media_types(SCSI *scgp);
+extern int get_supported_cdrw_media_types(SCSI *usalp);
#endif
/*
* mmc_misc.c
*/
#ifdef _SCG_SCSITRANSP_H
-extern int check_writemodes_mmc(SCSI *scgp, cdr_t *dp);
+extern int check_writemodes_mmc(SCSI *usalp, cdr_t *dp);
#endif /* _SCG_SCSITRANSP_H */
/*
@@ -1089,25 +1089,25 @@
*/
#ifdef _SCG_SCSITRANSP_H
#ifdef _SCG_SCSIREG_H
-extern cdr_t *drive_identify(SCSI *scgp, cdr_t *, struct scsi_inquiry *ip);
+extern cdr_t *drive_identify(SCSI *usalp, cdr_t *, struct scsi_inquiry *ip);
#else
-extern cdr_t *drive_identify(SCSI *scgp, cdr_t *, void *ip);
+extern cdr_t *drive_identify(SCSI *usalp, cdr_t *, void *ip);
#endif
-extern int drive_attach(SCSI *scgp, cdr_t *);
+extern int drive_attach(SCSI *usalp, cdr_t *);
#endif
extern int attach_unknown(void);
#ifdef _SCG_SCSITRANSP_H
-extern int blank_dummy(SCSI *scgp, cdr_t *, long addr, int blanktype);
-int format_dummy(SCSI *scgp, cdr_t *, int fmtflags);
-extern int drive_getdisktype(SCSI *scgp, cdr_t *dp);
-extern int cmd_ill(SCSI *scgp);
-extern int cmd_dummy(SCSI *scgp, cdr_t *);
-extern int no_sendcue(SCSI *scgp, cdr_t *, track_t *trackp);
-extern int buf_dummy(SCSI *scgp, long *sp, long *fp);
+extern int blank_dummy(SCSI *usalp, cdr_t *, long addr, int blanktype);
+int format_dummy(SCSI *usalp, cdr_t *, int fmtflags);
+extern int drive_getdisktype(SCSI *usalp, cdr_t *dp);
+extern int cmd_ill(SCSI *usalp);
+extern int cmd_dummy(SCSI *usalp, cdr_t *);
+extern int no_sendcue(SCSI *usalp, cdr_t *, track_t *trackp);
+extern int buf_dummy(SCSI *usalp, long *sp, long *fp);
#endif
extern BOOL set_cdrcmds(char *name, cdr_t **dpp);
#ifdef _SCG_SCSITRANSP_H
-extern cdr_t *get_cdrcmds(SCSI *scgp);
+extern cdr_t *get_cdrcmds(SCSI *usalp);
#endif
@@ -1117,7 +1117,7 @@
extern void mmc_opthelp(cdr_t *dp, int excode);
extern char *hasdrvopt(char *optstr, char *optname);
#ifdef _SCG_SCSITRANSP_H
-extern struct ricoh_mode_page_30 *get_justlink_ricoh(SCSI *scgp, Uchar *mode);
+extern struct ricoh_mode_page_30 *get_justlink_ricoh(SCSI *usalp, Uchar *mode);
#endif
/*
@@ -1166,9 +1166,9 @@
*/
extern int do_leadin(track_t *trackp);
#ifdef _SCG_SCSITRANSP_H
-extern int write_leadin(SCSI *scgp, cdr_t *dp, track_t *trackp,
+extern int write_leadin(SCSI *usalp, cdr_t *dp, track_t *trackp,
int leadinstart);
-extern int write_leadout(SCSI *scgp, cdr_t *dp, track_t *trackp);
+extern int write_leadout(SCSI *usalp, cdr_t *dp, track_t *trackp);
#endif
extern void fillsubch(track_t *trackp, Uchar *sp, int secno, int nsecs);
extern void filltpoint(Uchar *sub, int ctrl_adr, int point, msf_t *mp);
@@ -1199,7 +1199,7 @@
extern BOOL checktextfile(char *fname);
extern void packtext(int tracks, track_t *trackp);
#ifdef _SCG_SCSITRANSP_H
-extern int write_cdtext(SCSI *scgp, cdr_t *dp, long startsec);
+extern int write_cdtext(SCSI *usalp, cdr_t *dp, long startsec);
#endif
/*
More information about the Debburn-changes
mailing list