osx.c: try to eliminate invalid free of an uninitialized structure. untabify various drivers and get this more in-sync with gnu_linux.c driver.
This commit is contained in:
R. Bernstein
@@ -78,288 +78,288 @@
|
||||
#include <sys/scsiio.h>
|
||||
|
||||
#define TOTAL_TRACKS (_obj->tochdr.ending_track \
|
||||
- _obj->tochdr.starting_track + 1)
|
||||
- _obj->tochdr.starting_track + 1)
|
||||
#define FIRST_TRACK_NUM (_obj->tochdr.starting_track)
|
||||
|
||||
typedef struct {
|
||||
generic_img_private_t gen;
|
||||
generic_img_private_t gen;
|
||||
|
||||
bool toc_valid;
|
||||
struct ioc_toc_header tochdr;
|
||||
struct cd_toc_entry tocent[100];
|
||||
bool toc_valid;
|
||||
struct ioc_toc_header tochdr;
|
||||
struct cd_toc_entry tocent[100];
|
||||
|
||||
bool sessionformat_valid;
|
||||
int sessionformat[100]; /* format of the session the track is in */
|
||||
bool sessionformat_valid;
|
||||
int sessionformat[100]; /* format of the session the track is in */
|
||||
} _img_private_t;
|
||||
|
||||
static driver_return_code_t
|
||||
run_scsi_cmd_netbsd(void *p_user_data, unsigned int i_timeout_ms,
|
||||
unsigned int i_cdb, const mmc_cdb_t *p_cdb,
|
||||
cdio_mmc_direction_t e_direction,
|
||||
unsigned int i_buf, void *p_buf )
|
||||
unsigned int i_cdb, const mmc_cdb_t *p_cdb,
|
||||
cdio_mmc_direction_t e_direction,
|
||||
unsigned int i_buf, void *p_buf )
|
||||
{
|
||||
const _img_private_t *_obj = p_user_data;
|
||||
scsireq_t req;
|
||||
const _img_private_t *_obj = p_user_data;
|
||||
scsireq_t req;
|
||||
|
||||
memset(&req, 0, sizeof(req));
|
||||
memcpy(&req.cmd[0], p_cdb, i_cdb);
|
||||
req.cmdlen = i_cdb;
|
||||
req.datalen = i_buf;
|
||||
req.databuf = p_buf;
|
||||
req.timeout = i_timeout_ms;
|
||||
req.flags = e_direction == SCSI_MMC_DATA_READ ? SCCMD_READ : SCCMD_WRITE;
|
||||
memset(&req, 0, sizeof(req));
|
||||
memcpy(&req.cmd[0], p_cdb, i_cdb);
|
||||
req.cmdlen = i_cdb;
|
||||
req.datalen = i_buf;
|
||||
req.databuf = p_buf;
|
||||
req.timeout = i_timeout_ms;
|
||||
req.flags = e_direction == SCSI_MMC_DATA_READ ? SCCMD_READ : SCCMD_WRITE;
|
||||
|
||||
if (ioctl(_obj->gen.fd, SCIOCCOMMAND, &req) < 0) {
|
||||
perror("SCIOCCOMMAND");
|
||||
return -1;
|
||||
}
|
||||
if (req.retsts != SCCMD_OK) {
|
||||
fprintf(stderr, "SCIOCCOMMAND cmd 0x%02x sts %d\n", req.cmd[0], req.retsts);
|
||||
return -1;
|
||||
}
|
||||
if (ioctl(_obj->gen.fd, SCIOCCOMMAND, &req) < 0) {
|
||||
perror("SCIOCCOMMAND");
|
||||
return -1;
|
||||
}
|
||||
if (req.retsts != SCCMD_OK) {
|
||||
fprintf(stderr, "SCIOCCOMMAND cmd 0x%02x sts %d\n", req.cmd[0], req.retsts);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
read_audio_sectors_netbsd(void *user_data, void *data, lsn_t lsn,
|
||||
unsigned int nblocks)
|
||||
unsigned int nblocks)
|
||||
{
|
||||
scsireq_t req;
|
||||
_img_private_t *_obj = user_data;
|
||||
scsireq_t req;
|
||||
_img_private_t *_obj = user_data;
|
||||
|
||||
memset(&req, 0, sizeof(req));
|
||||
req.cmd[0] = 0xbe;
|
||||
req.cmd[1] = 0;
|
||||
req.cmd[2] = (lsn >> 24) & 0xff;
|
||||
req.cmd[3] = (lsn >> 16) & 0xff;
|
||||
req.cmd[4] = (lsn >> 8) & 0xff;
|
||||
req.cmd[5] = (lsn >> 0) & 0xff;
|
||||
req.cmd[6] = (nblocks >> 16) & 0xff;
|
||||
req.cmd[7] = (nblocks >> 8) & 0xff;
|
||||
req.cmd[8] = (nblocks >> 0) & 0xff;
|
||||
req.cmd[9] = 0x78;
|
||||
req.cmdlen = 10;
|
||||
memset(&req, 0, sizeof(req));
|
||||
req.cmd[0] = 0xbe;
|
||||
req.cmd[1] = 0;
|
||||
req.cmd[2] = (lsn >> 24) & 0xff;
|
||||
req.cmd[3] = (lsn >> 16) & 0xff;
|
||||
req.cmd[4] = (lsn >> 8) & 0xff;
|
||||
req.cmd[5] = (lsn >> 0) & 0xff;
|
||||
req.cmd[6] = (nblocks >> 16) & 0xff;
|
||||
req.cmd[7] = (nblocks >> 8) & 0xff;
|
||||
req.cmd[8] = (nblocks >> 0) & 0xff;
|
||||
req.cmd[9] = 0x78;
|
||||
req.cmdlen = 10;
|
||||
|
||||
req.datalen = nblocks * CDIO_CD_FRAMESIZE_RAW;
|
||||
req.databuf = data;
|
||||
req.timeout = 10000;
|
||||
req.flags = SCCMD_READ;
|
||||
req.datalen = nblocks * CDIO_CD_FRAMESIZE_RAW;
|
||||
req.databuf = data;
|
||||
req.timeout = 10000;
|
||||
req.flags = SCCMD_READ;
|
||||
|
||||
if (ioctl(_obj->gen.fd, SCIOCCOMMAND, &req) < 0) {
|
||||
perror("SCIOCCOMMAND");
|
||||
return 1;
|
||||
}
|
||||
if (req.retsts != SCCMD_OK) {
|
||||
fprintf(stderr, "SCIOCCOMMAND cmd 0xbe sts %d\n", req.retsts);
|
||||
return 1;
|
||||
}
|
||||
if (ioctl(_obj->gen.fd, SCIOCCOMMAND, &req) < 0) {
|
||||
perror("SCIOCCOMMAND");
|
||||
return 1;
|
||||
}
|
||||
if (req.retsts != SCCMD_OK) {
|
||||
fprintf(stderr, "SCIOCCOMMAND cmd 0xbe sts %d\n", req.retsts);
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
read_mode2_sector_netbsd(void *user_data, void *data, lsn_t lsn,
|
||||
bool mode2_form2)
|
||||
bool mode2_form2)
|
||||
{
|
||||
scsireq_t req;
|
||||
_img_private_t *_obj = user_data;
|
||||
char buf[M2RAW_SECTOR_SIZE] = { 0, };
|
||||
scsireq_t req;
|
||||
_img_private_t *_obj = user_data;
|
||||
char buf[M2RAW_SECTOR_SIZE] = { 0, };
|
||||
|
||||
memset(&req, 0, sizeof(req));
|
||||
req.cmd[0] = 0xbe;
|
||||
req.cmd[1] = 0;
|
||||
req.cmd[2] = (lsn >> 24) & 0xff;
|
||||
req.cmd[3] = (lsn >> 16) & 0xff;
|
||||
req.cmd[4] = (lsn >> 8) & 0xff;
|
||||
req.cmd[5] = (lsn >> 0) & 0xff;
|
||||
req.cmd[6] = 0;
|
||||
req.cmd[7] = 0;
|
||||
req.cmd[8] = 1;
|
||||
req.cmd[9] = 0x58; /* subheader + userdata + ECC */
|
||||
req.cmdlen = 10;
|
||||
memset(&req, 0, sizeof(req));
|
||||
req.cmd[0] = 0xbe;
|
||||
req.cmd[1] = 0;
|
||||
req.cmd[2] = (lsn >> 24) & 0xff;
|
||||
req.cmd[3] = (lsn >> 16) & 0xff;
|
||||
req.cmd[4] = (lsn >> 8) & 0xff;
|
||||
req.cmd[5] = (lsn >> 0) & 0xff;
|
||||
req.cmd[6] = 0;
|
||||
req.cmd[7] = 0;
|
||||
req.cmd[8] = 1;
|
||||
req.cmd[9] = 0x58; /* subheader + userdata + ECC */
|
||||
req.cmdlen = 10;
|
||||
|
||||
req.datalen = M2RAW_SECTOR_SIZE;
|
||||
req.databuf = buf;
|
||||
req.timeout = 10000;
|
||||
req.flags = SCCMD_READ;
|
||||
req.datalen = M2RAW_SECTOR_SIZE;
|
||||
req.databuf = buf;
|
||||
req.timeout = 10000;
|
||||
req.flags = SCCMD_READ;
|
||||
|
||||
if (ioctl(_obj->gen.fd, SCIOCCOMMAND, &req) < 0) {
|
||||
perror("SCIOCCOMMAND");
|
||||
return 1;
|
||||
}
|
||||
if (req.retsts != SCCMD_OK) {
|
||||
fprintf(stderr, "SCIOCCOMMAND cmd 0xbe sts %d\n", req.retsts);
|
||||
return 1;
|
||||
}
|
||||
if (ioctl(_obj->gen.fd, SCIOCCOMMAND, &req) < 0) {
|
||||
perror("SCIOCCOMMAND");
|
||||
return 1;
|
||||
}
|
||||
if (req.retsts != SCCMD_OK) {
|
||||
fprintf(stderr, "SCIOCCOMMAND cmd 0xbe sts %d\n", req.retsts);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (mode2_form2)
|
||||
memcpy(data, buf, M2RAW_SECTOR_SIZE);
|
||||
else
|
||||
memcpy(data, buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
|
||||
if (mode2_form2)
|
||||
memcpy(data, buf, M2RAW_SECTOR_SIZE);
|
||||
else
|
||||
memcpy(data, buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
read_mode2_sectors_netbsd(void *user_data, void *data, lsn_t lsn,
|
||||
bool mode2_form2, unsigned int nblocks)
|
||||
bool mode2_form2, unsigned int nblocks)
|
||||
{
|
||||
int i, res;
|
||||
char *buf = data;
|
||||
int i, res;
|
||||
char *buf = data;
|
||||
|
||||
for (i = 0; i < nblocks; i++) {
|
||||
res = read_mode2_sector_netbsd(user_data, buf, lsn, mode2_form2);
|
||||
if (res)
|
||||
return res;
|
||||
for (i = 0; i < nblocks; i++) {
|
||||
res = read_mode2_sector_netbsd(user_data, buf, lsn, mode2_form2);
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
buf += (mode2_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE);
|
||||
lsn++;
|
||||
}
|
||||
buf += (mode2_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE);
|
||||
lsn++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
set_arg_netbsd(void *user_data, const char key[], const char value[])
|
||||
{
|
||||
_img_private_t *_obj = user_data;
|
||||
_img_private_t *_obj = user_data;
|
||||
|
||||
if (!strcmp(key, "source")) {
|
||||
if (!value)
|
||||
return -2;
|
||||
if (!strcmp(key, "source")) {
|
||||
if (!value)
|
||||
return -2;
|
||||
|
||||
free(_obj->gen.source_name);
|
||||
_obj->gen.source_name = strdup(value);
|
||||
} else if (!strcmp(key, "access-mode")) {
|
||||
if (strcmp(value, "READ_CD"))
|
||||
cdio_error("unknown access type: %s ignored.", value);
|
||||
} else
|
||||
return -1;
|
||||
free(_obj->gen.source_name);
|
||||
_obj->gen.source_name = strdup(value);
|
||||
} else if (!strcmp(key, "access-mode")) {
|
||||
if (strcmp(value, "READ_CD"))
|
||||
cdio_error("unknown access type: %s ignored.", value);
|
||||
} else
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static bool
|
||||
_cdio_read_toc(_img_private_t *_obj)
|
||||
{
|
||||
int res;
|
||||
struct ioc_read_toc_entry req;
|
||||
int res;
|
||||
struct ioc_read_toc_entry req;
|
||||
|
||||
res = ioctl(_obj->gen.fd, CDIOREADTOCHEADER, &_obj->tochdr);
|
||||
if (res < 0) {
|
||||
cdio_error("error in ioctl(CDIOREADTOCHEADER): %s\n",
|
||||
strerror(errno));
|
||||
return false;
|
||||
}
|
||||
res = ioctl(_obj->gen.fd, CDIOREADTOCHEADER, &_obj->tochdr);
|
||||
if (res < 0) {
|
||||
cdio_error("error in ioctl(CDIOREADTOCHEADER): %s\n",
|
||||
strerror(errno));
|
||||
return false;
|
||||
}
|
||||
|
||||
req.address_format = CD_MSF_FORMAT;
|
||||
req.starting_track = FIRST_TRACK_NUM;
|
||||
req.data_len = (TOTAL_TRACKS + 1) /* leadout! */
|
||||
* sizeof(struct cd_toc_entry);
|
||||
req.data = _obj->tocent;
|
||||
req.address_format = CD_MSF_FORMAT;
|
||||
req.starting_track = FIRST_TRACK_NUM;
|
||||
req.data_len = (TOTAL_TRACKS + 1) /* leadout! */
|
||||
* sizeof(struct cd_toc_entry);
|
||||
req.data = _obj->tocent;
|
||||
|
||||
res = ioctl(_obj->gen.fd, CDIOREADTOCENTRIES, &req);
|
||||
if (res < 0) {
|
||||
cdio_error("error in ioctl(CDROMREADTOCENTRIES): %s\n",
|
||||
strerror(errno));
|
||||
return false;
|
||||
}
|
||||
res = ioctl(_obj->gen.fd, CDIOREADTOCENTRIES, &req);
|
||||
if (res < 0) {
|
||||
cdio_error("error in ioctl(CDROMREADTOCENTRIES): %s\n",
|
||||
strerror(errno));
|
||||
return false;
|
||||
}
|
||||
|
||||
_obj->toc_valid = 1;
|
||||
return true;
|
||||
_obj->toc_valid = 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
read_toc_netbsd (void *p_user_data)
|
||||
{
|
||||
|
||||
return _cdio_read_toc(p_user_data);
|
||||
return _cdio_read_toc(p_user_data);
|
||||
}
|
||||
|
||||
static int
|
||||
_cdio_read_discinfo(_img_private_t *_obj)
|
||||
{
|
||||
scsireq_t req;
|
||||
scsireq_t req;
|
||||
#define FULLTOCBUF (4 + 1000*11)
|
||||
unsigned char buf[FULLTOCBUF] = { 0, };
|
||||
int i, j;
|
||||
unsigned char buf[FULLTOCBUF] = { 0, };
|
||||
int i, j;
|
||||
|
||||
memset(&req, 0, sizeof(req));
|
||||
req.cmd[0] = 0x43; /* READ TOC/PMA/ATIP */
|
||||
req.cmd[1] = 0x02;
|
||||
req.cmd[2] = 0x02; /* full TOC */
|
||||
req.cmd[3] = 0;
|
||||
req.cmd[4] = 0;
|
||||
req.cmd[5] = 0;
|
||||
req.cmd[6] = 0;
|
||||
req.cmd[7] = FULLTOCBUF / 256;
|
||||
req.cmd[8] = FULLTOCBUF % 256;
|
||||
req.cmd[9] = 0;
|
||||
req.cmdlen = 10;
|
||||
memset(&req, 0, sizeof(req));
|
||||
req.cmd[0] = 0x43; /* READ TOC/PMA/ATIP */
|
||||
req.cmd[1] = 0x02;
|
||||
req.cmd[2] = 0x02; /* full TOC */
|
||||
req.cmd[3] = 0;
|
||||
req.cmd[4] = 0;
|
||||
req.cmd[5] = 0;
|
||||
req.cmd[6] = 0;
|
||||
req.cmd[7] = FULLTOCBUF / 256;
|
||||
req.cmd[8] = FULLTOCBUF % 256;
|
||||
req.cmd[9] = 0;
|
||||
req.cmdlen = 10;
|
||||
|
||||
req.datalen = FULLTOCBUF;
|
||||
req.databuf = buf;
|
||||
req.timeout = 10000;
|
||||
req.flags = SCCMD_READ;
|
||||
req.datalen = FULLTOCBUF;
|
||||
req.databuf = buf;
|
||||
req.timeout = 10000;
|
||||
req.flags = SCCMD_READ;
|
||||
|
||||
if (ioctl(_obj->gen.fd, SCIOCCOMMAND, &req) < 0) {
|
||||
perror("SCIOCCOMMAND");
|
||||
return 1;
|
||||
}
|
||||
if (req.retsts != SCCMD_OK) {
|
||||
fprintf(stderr, "SCIOCCOMMAND cmd 0x43 sts %d\n", req.retsts);
|
||||
return 1;
|
||||
}
|
||||
if (ioctl(_obj->gen.fd, SCIOCCOMMAND, &req) < 0) {
|
||||
perror("SCIOCCOMMAND");
|
||||
return 1;
|
||||
}
|
||||
if (req.retsts != SCCMD_OK) {
|
||||
fprintf(stderr, "SCIOCCOMMAND cmd 0x43 sts %d\n", req.retsts);
|
||||
return 1;
|
||||
}
|
||||
#if 1
|
||||
printf("discinfo:");
|
||||
for (i = 0; i < 4; i++)
|
||||
printf(" %02x", buf[i]);
|
||||
printf("\n");
|
||||
for (i = 0; i < buf[1] - 2; i++) {
|
||||
printf(" %02x", buf[i + 4]);
|
||||
if (!((i + 1) % 11))
|
||||
printf("\n");
|
||||
}
|
||||
printf("discinfo:");
|
||||
for (i = 0; i < 4; i++)
|
||||
printf(" %02x", buf[i]);
|
||||
printf("\n");
|
||||
for (i = 0; i < buf[1] - 2; i++) {
|
||||
printf(" %02x", buf[i + 4]);
|
||||
if (!((i + 1) % 11))
|
||||
printf("\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
for (i = 4; i < req.datalen_used; i += 11) {
|
||||
if (buf[i + 3] == 0xa0) { /* POINT */
|
||||
/* XXX: assume entry 0xa1 follows */
|
||||
for (j = buf[i + 8] - 1; j <= buf[i + 11 + 8] - 1; j++)
|
||||
_obj->sessionformat[j] = buf[i + 9];
|
||||
}
|
||||
}
|
||||
for (i = 4; i < req.datalen_used; i += 11) {
|
||||
if (buf[i + 3] == 0xa0) { /* POINT */
|
||||
/* XXX: assume entry 0xa1 follows */
|
||||
for (j = buf[i + 8] - 1; j <= buf[i + 11 + 8] - 1; j++)
|
||||
_obj->sessionformat[j] = buf[i + 9];
|
||||
}
|
||||
}
|
||||
|
||||
_obj->sessionformat_valid = true;
|
||||
return 0;
|
||||
_obj->sessionformat_valid = true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
eject_media_netbsd(void *user_data) {
|
||||
|
||||
_img_private_t *_obj = user_data;
|
||||
int fd, res, ret = 0;
|
||||
_img_private_t *_obj = user_data;
|
||||
int fd, res, ret = 0;
|
||||
|
||||
fd = open(_obj->gen.source_name, O_RDONLY|O_NONBLOCK);
|
||||
if (fd < 0)
|
||||
return 2;
|
||||
fd = open(_obj->gen.source_name, O_RDONLY|O_NONBLOCK);
|
||||
if (fd < 0)
|
||||
return 2;
|
||||
|
||||
res = ioctl(fd, CDIOCALLOW);
|
||||
if (res < 0) {
|
||||
cdio_error("ioctl(fd, CDIOCALLOW) failed: %s\n",
|
||||
strerror(errno));
|
||||
/* go on... */
|
||||
}
|
||||
res = ioctl(fd, CDIOCEJECT);
|
||||
if (res < 0) {
|
||||
cdio_error("ioctl(CDIOCEJECT) failed: %s\n",
|
||||
strerror(errno));
|
||||
ret = 1;
|
||||
}
|
||||
res = ioctl(fd, CDIOCALLOW);
|
||||
if (res < 0) {
|
||||
cdio_error("ioctl(fd, CDIOCALLOW) failed: %s\n",
|
||||
strerror(errno));
|
||||
/* go on... */
|
||||
}
|
||||
res = ioctl(fd, CDIOCEJECT);
|
||||
if (res < 0) {
|
||||
cdio_error("ioctl(CDIOCEJECT) failed: %s\n",
|
||||
strerror(errno));
|
||||
ret = 1;
|
||||
}
|
||||
|
||||
close(fd);
|
||||
return ret;
|
||||
close(fd);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -368,47 +368,47 @@ eject_media_netbsd(void *user_data) {
|
||||
static const char *
|
||||
get_arg_netbsd(void *user_data, const char key[])
|
||||
{
|
||||
_img_private_t *_obj = user_data;
|
||||
_img_private_t *_obj = user_data;
|
||||
|
||||
if (!strcmp(key, "source")) {
|
||||
return _obj->gen.source_name;
|
||||
} else if (!strcmp(key, "access-mode")) {
|
||||
return "READ_CD";
|
||||
if (!strcmp(key, "source")) {
|
||||
return _obj->gen.source_name;
|
||||
} else if (!strcmp(key, "access-mode")) {
|
||||
return "READ_CD";
|
||||
} else if (!strcmp (key, "mmc-supported?")) {
|
||||
return "true" ;
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static track_t
|
||||
get_first_track_num_netbsd(void *user_data)
|
||||
{
|
||||
_img_private_t *_obj = user_data;
|
||||
int res;
|
||||
_img_private_t *_obj = user_data;
|
||||
int res;
|
||||
|
||||
if (!_obj->toc_valid) {
|
||||
res = _cdio_read_toc(_obj);
|
||||
if (!res)
|
||||
return CDIO_INVALID_TRACK;
|
||||
}
|
||||
if (!_obj->toc_valid) {
|
||||
res = _cdio_read_toc(_obj);
|
||||
if (!res)
|
||||
return CDIO_INVALID_TRACK;
|
||||
}
|
||||
|
||||
return FIRST_TRACK_NUM;
|
||||
return FIRST_TRACK_NUM;
|
||||
}
|
||||
|
||||
static track_t
|
||||
get_num_tracks_netbsd(void *user_data)
|
||||
{
|
||||
_img_private_t *_obj = user_data;
|
||||
int res;
|
||||
_img_private_t *_obj = user_data;
|
||||
int res;
|
||||
|
||||
if (!_obj->toc_valid) {
|
||||
res = _cdio_read_toc(_obj);
|
||||
if (!res)
|
||||
return CDIO_INVALID_TRACK;
|
||||
}
|
||||
if (!_obj->toc_valid) {
|
||||
res = _cdio_read_toc(_obj);
|
||||
if (!res)
|
||||
return CDIO_INVALID_TRACK;
|
||||
}
|
||||
|
||||
return TOTAL_TRACKS;
|
||||
return TOTAL_TRACKS;
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -417,33 +417,33 @@ get_num_tracks_netbsd(void *user_data)
|
||||
static track_format_t
|
||||
get_track_format_netbsd(void *user_data, track_t track_num)
|
||||
{
|
||||
_img_private_t *_obj = user_data;
|
||||
int res;
|
||||
_img_private_t *_obj = user_data;
|
||||
int res;
|
||||
|
||||
if (!_obj->toc_valid) {
|
||||
res = _cdio_read_toc(_obj);
|
||||
if (!res)
|
||||
return CDIO_INVALID_TRACK;
|
||||
}
|
||||
if (!_obj->toc_valid) {
|
||||
res = _cdio_read_toc(_obj);
|
||||
if (!res)
|
||||
return CDIO_INVALID_TRACK;
|
||||
}
|
||||
|
||||
if (track_num > TOTAL_TRACKS || track_num == 0)
|
||||
return TRACK_FORMAT_ERROR;
|
||||
if (track_num > TOTAL_TRACKS || track_num == 0)
|
||||
return TRACK_FORMAT_ERROR;
|
||||
|
||||
if (_obj->tocent[track_num - 1].control & 0x04) {
|
||||
if (!_obj->sessionformat_valid) {
|
||||
res = _cdio_read_discinfo(_obj);
|
||||
if (res)
|
||||
return CDIO_INVALID_TRACK;
|
||||
}
|
||||
if (_obj->tocent[track_num - 1].control & 0x04) {
|
||||
if (!_obj->sessionformat_valid) {
|
||||
res = _cdio_read_discinfo(_obj);
|
||||
if (res)
|
||||
return CDIO_INVALID_TRACK;
|
||||
}
|
||||
|
||||
if (_obj->sessionformat[track_num - 1] == 0x10)
|
||||
return TRACK_FORMAT_CDI;
|
||||
else if (_obj->sessionformat[track_num - 1] == 0x20)
|
||||
return TRACK_FORMAT_XA;
|
||||
else
|
||||
return TRACK_FORMAT_DATA;
|
||||
} else
|
||||
return TRACK_FORMAT_AUDIO;
|
||||
if (_obj->sessionformat[track_num - 1] == 0x10)
|
||||
return TRACK_FORMAT_CDI;
|
||||
else if (_obj->sessionformat[track_num - 1] == 0x20)
|
||||
return TRACK_FORMAT_XA;
|
||||
else
|
||||
return TRACK_FORMAT_DATA;
|
||||
} else
|
||||
return TRACK_FORMAT_AUDIO;
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -458,8 +458,8 @@ static bool
|
||||
get_track_green_netbsd(void *user_data, track_t track_num)
|
||||
{
|
||||
|
||||
return (get_track_format_netbsd(user_data, track_num)
|
||||
== TRACK_FORMAT_XA);
|
||||
return (get_track_format_netbsd(user_data, track_num)
|
||||
== TRACK_FORMAT_XA);
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -474,29 +474,29 @@ get_track_green_netbsd(void *user_data, track_t track_num)
|
||||
static bool
|
||||
get_track_msf_netbsd(void *user_data, track_t track_num, msf_t *msf)
|
||||
{
|
||||
_img_private_t *_obj = user_data;
|
||||
int res;
|
||||
_img_private_t *_obj = user_data;
|
||||
int res;
|
||||
|
||||
if (!msf)
|
||||
return false;
|
||||
if (!msf)
|
||||
return false;
|
||||
|
||||
if (!_obj->toc_valid) {
|
||||
res = _cdio_read_toc(_obj);
|
||||
if (!res)
|
||||
return CDIO_INVALID_TRACK;
|
||||
}
|
||||
if (!_obj->toc_valid) {
|
||||
res = _cdio_read_toc(_obj);
|
||||
if (!res)
|
||||
return CDIO_INVALID_TRACK;
|
||||
}
|
||||
|
||||
if (track_num == CDIO_CDROM_LEADOUT_TRACK)
|
||||
track_num = TOTAL_TRACKS + 1;
|
||||
if (track_num == CDIO_CDROM_LEADOUT_TRACK)
|
||||
track_num = TOTAL_TRACKS + 1;
|
||||
|
||||
if (track_num > TOTAL_TRACKS + 1 || track_num == 0)
|
||||
return false;
|
||||
if (track_num > TOTAL_TRACKS + 1 || track_num == 0)
|
||||
return false;
|
||||
|
||||
msf->m = cdio_to_bcd8(_obj->tocent[track_num - 1].addr.msf.minute);
|
||||
msf->s = cdio_to_bcd8(_obj->tocent[track_num - 1].addr.msf.second);
|
||||
msf->f = cdio_to_bcd8(_obj->tocent[track_num - 1].addr.msf.frame);
|
||||
msf->m = cdio_to_bcd8(_obj->tocent[track_num - 1].addr.msf.minute);
|
||||
msf->s = cdio_to_bcd8(_obj->tocent[track_num - 1].addr.msf.second);
|
||||
msf->f = cdio_to_bcd8(_obj->tocent[track_num - 1].addr.msf.frame);
|
||||
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -510,11 +510,11 @@ get_track_msf_netbsd(void *user_data, track_t track_num, msf_t *msf)
|
||||
static lsn_t
|
||||
get_disc_last_lsn_netbsd(void *user_data)
|
||||
{
|
||||
msf_t msf;
|
||||
msf_t msf;
|
||||
|
||||
get_track_msf_netbsd(user_data, CDIO_CDROM_LEADOUT_TRACK, &msf);
|
||||
get_track_msf_netbsd(user_data, CDIO_CDROM_LEADOUT_TRACK, &msf);
|
||||
|
||||
return (((msf.m * 60) + msf.s) * CDIO_CD_FRAMES_PER_SEC + msf.f);
|
||||
return (((msf.m * 60) + msf.s) * CDIO_CD_FRAMES_PER_SEC + msf.f);
|
||||
}
|
||||
#endif /* HAVE_NETBSD_CDROM */
|
||||
|
||||
@@ -601,35 +601,40 @@ CdIo_t *
|
||||
cdio_open_netbsd(const char *source_name)
|
||||
{
|
||||
#ifdef HAVE_NETBSD_CDROM
|
||||
CdIo_t *ret;
|
||||
_img_private_t *_data;
|
||||
CdIo_t *ret;
|
||||
_img_private_t *_data;
|
||||
|
||||
_data = calloc(1, sizeof(_img_private_t));
|
||||
|
||||
_data = calloc(1, sizeof(_img_private_t));
|
||||
_data->gen.b_cdtext_error = false;
|
||||
_data->gen.init = false;
|
||||
_data->gen.fd = -1;
|
||||
_data->toc_valid = false;
|
||||
_data->sessionformat_valid = false;
|
||||
_data->gen.init = false;
|
||||
_data->toc_valid = false;
|
||||
_data->sessionformat_valid = false;
|
||||
_data->gen.fd = -1;
|
||||
_data->gen.b_cdtext_error = false;
|
||||
|
||||
set_arg_netbsd(_data, "source",
|
||||
(source_name ? source_name : DEFAULT_CDIO_DEVICE));
|
||||
|
||||
if (source_name && !cdio_is_device_generic(source_name))
|
||||
return (NULL);
|
||||
|
||||
ret = cdio_new(&_data->gen, &_funcs);
|
||||
if (ret == NULL) return NULL;
|
||||
|
||||
ret->driver_id = DRIVER_NETBSD;
|
||||
|
||||
set_arg_netbsd(_data, "source",
|
||||
(source_name ? source_name : DEFAULT_CDIO_DEVICE));
|
||||
if (cdio_generic_init(_data, O_RDONLY)) {
|
||||
return ret;
|
||||
} else {
|
||||
cdio_generic_free(_data);
|
||||
free(ret);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (source_name && !cdio_is_device_generic(source_name))
|
||||
return (NULL);
|
||||
|
||||
ret = cdio_new(&_data->gen, &_funcs);
|
||||
if (!ret)
|
||||
return NULL;
|
||||
|
||||
if (cdio_generic_init(_data, O_RDONLY)) {
|
||||
return ret;
|
||||
} else {
|
||||
cdio_generic_free(_data);
|
||||
return NULL;
|
||||
}
|
||||
#else
|
||||
return NULL;
|
||||
#endif /* HAVE_BSDI_CDROM */
|
||||
#endif /* HAVE_NETBSD_CDROM */
|
||||
|
||||
}
|
||||
|
||||
/*!
|
||||
|
||||
Reference in New Issue
Block a user