claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

cmd -> cdb to match MMC terminology and Solaris naming.

Browse Source
This commit is contained in:
rocky
2004-07-15 11:36:12 +00:00
parent 268d5c9926
commit c77831ff51
1 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
lib/_cdio_linux.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_linux.c,v 1.63 2004/07/15 02:24:29 rocky Exp $ $Id: _cdio_linux.c,v 1.64 2004/07/15 11:36:12 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.63 2004/07/15 02:24:29 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.64 2004/07/15 11:36:12 rocky Exp $";
#include <string.h> #include <string.h>
@@ -245,7 +245,8 @@ _set_bsize (int fd, unsigned int bsize)
memset (&mh, 0, sizeof (mh)); memset (&mh, 0, sizeof (mh));
memset (&cgc, 0, sizeof (struct cdrom_generic_command)); memset (&cgc, 0, sizeof (struct cdrom_generic_command));
cgc.cmd[0] = 0x15; CDIO_MMC_SET_COMMAND(cgc.cmd, CDIO_MMC_GPCMD_MODE_SELECT_6);
cgc.cmd[1] = 1 << 4; cgc.cmd[1] = 1 << 4;
cgc.cmd[4] = 12; cgc.cmd[4] = 12;
@@ -707,18 +708,18 @@ _get_cdtext_linux (void *user_data)
struct scsi_cmd { struct scsi_cmd {
unsigned int inlen; /* Length of data written to device */ unsigned int inlen; /* Length of data written to device */
unsigned int outlen; /* Length of data read from device */ unsigned int outlen; /* Length of data read from device */
unsigned char cmd[10]; /* SCSI command (6 <= x <= 16) */ unsigned char cdb[10]; /* SCSI command bytes (6 <= x <= 16) */
unsigned char wdata[5000]; /* Data read from device starts here unsigned char wdata[5000]; /* Data read from device starts here
On error, sense buffer starts here */ On error, sense buffer starts here */
} scsi_cmd; } scsi_cmd;
memset( scsi_cmd.cmd, 0, sizeof(scsi_cmd.cmd) ); memset( scsi_cmd.cdb, 0, sizeof(scsi_cmd.cdb) );
CDIO_MMC_SET_COMMAND(scsi_cmd.cmd, CDIO_MMC_GPCMD_READ_TOC); CDIO_MMC_SET_COMMAND(scsi_cmd.cdb, CDIO_MMC_GPCMD_READ_TOC);
scsi_cmd.cmd[1] = 0x02; /* MSF mode */ scsi_cmd.cdb[1] = 0x02; /* MSF mode */
scsi_cmd.cmd[2] = 0x05; /* CD text */ scsi_cmd.cdb[2] = 0x05; /* CD text */
CDIO_MMC_SET_READ_LENGTH(scsi_cmd.cmd, sizeof(scsi_cmd.wdata)); CDIO_MMC_SET_READ_LENGTH(scsi_cmd.cdb, sizeof(scsi_cmd.wdata));
scsi_cmd.inlen = sizeof(scsi_cmd.cmd); scsi_cmd.inlen = sizeof(scsi_cmd.cdb);
scsi_cmd.outlen = sizeof(scsi_cmd.wdata); scsi_cmd.outlen = sizeof(scsi_cmd.wdata);
status = ioctl(env->gen.fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd); status = ioctl(env->gen.fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd);
if (status != 0) { if (status != 0) {
@@ -800,44 +801,44 @@ _eject_media_mmc(int fd)
{ {
int status; int status;
struct sdata { struct sdata {
unsigned int inlen; /* input: Length of data written to device */ unsigned int inlen; /* Length of data written to device */
unsigned int outlen; /* input: Length of data read from device */ unsigned int outlen; /* Length of data read from device */
char cmd[10]; /* input: SCSI command (6 <= x <= 16) */ char cdb[10]; /* SCSI command bytes (6 <= x <= 16) */
} scsi_cmd; } scsi_cmd;
CDIO_MMC_SET_COMMAND(scsi_cmd.cmd, CDIO_MMC_GPCMD_ALLOW_MEDIUM_REMOVAL); CDIO_MMC_SET_COMMAND(scsi_cmd.cdb, CDIO_MMC_GPCMD_ALLOW_MEDIUM_REMOVAL);
scsi_cmd.inlen = 0; scsi_cmd.inlen = 0;
scsi_cmd.outlen = 0; scsi_cmd.outlen = 0;
scsi_cmd.cmd[1] = 0; scsi_cmd.cdb[1] = 0;
scsi_cmd.cmd[2] = 0; scsi_cmd.cdb[2] = 0;
scsi_cmd.cmd[3] = 0; scsi_cmd.cdb[3] = 0;
scsi_cmd.cmd[4] = 0; scsi_cmd.cdb[4] = 0;
scsi_cmd.cmd[5] = 0; scsi_cmd.cdb[5] = 0;
status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd); status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd);
if (status != 0) if (status != 0)
return status; return status;
scsi_cmd.inlen = 0; scsi_cmd.inlen = 0;
scsi_cmd.outlen = 0; scsi_cmd.outlen = 0;
CDIO_MMC_SET_COMMAND(scsi_cmd.cmd, CDIO_MMC_GPCMD_START_STOP); CDIO_MMC_SET_COMMAND(scsi_cmd.cdb, CDIO_MMC_GPCMD_START_STOP);
scsi_cmd.cmd[1] = 0; scsi_cmd.cdb[1] = 0;
scsi_cmd.cmd[2] = 0; scsi_cmd.cdb[2] = 0;
scsi_cmd.cmd[3] = 0; scsi_cmd.cdb[3] = 0;
scsi_cmd.cmd[4] = 1; scsi_cmd.cdb[4] = 1;
scsi_cmd.cmd[5] = 0; scsi_cmd.cdb[5] = 0;
status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd); status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd);
if (status != 0) if (status != 0)
return status; return status;
scsi_cmd.inlen = 0; scsi_cmd.inlen = 0;
scsi_cmd.outlen = 0; scsi_cmd.outlen = 0;
CDIO_MMC_SET_COMMAND(scsi_cmd.cmd, CDIO_MMC_GPCMD_START_STOP); CDIO_MMC_SET_COMMAND(scsi_cmd.cdb, CDIO_MMC_GPCMD_START_STOP);
scsi_cmd.cmd[1] = 0; scsi_cmd.cdb[1] = 0;
scsi_cmd.cmd[2] = 0; scsi_cmd.cdb[2] = 0;
scsi_cmd.cmd[3] = 0; scsi_cmd.cdb[3] = 0;
scsi_cmd.cmd[4] = 2; /* eject */ scsi_cmd.cdb[4] = 2; /* eject */
scsi_cmd.cmd[5] = 0; scsi_cmd.cdb[5] = 0;
status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd); status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd);
if (status != 0) if (status != 0)
return status; return status;