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

netbsd.c: add more ops. Doc functions, bring more in line with other drivers.

Browse Source
This commit is contained in:
rocky
2008-03-28 02:03:13 +00:00
parent 70be01d454
commit 4b172d9cc2
2 changed files with 141 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/driver/gnu_linux.c
View File

@@ -1,9 +1,9 @@
/* /*
$Id: gnu_linux.c,v 1.28 2007/03/07 04:35:47 rocky Exp $ $Id: gnu_linux.c,v 1.29 2008/03/28 02:03:13 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, 2005, 2006 Rocky Bernstein Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008 Rocky Bernstein
<rockyb@users.sourceforge.net> <rockyb@gnu.org>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -28,12 +28,11 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: gnu_linux.c,v 1.28 2007/03/07 04:35:47 rocky Exp $"; static const char _rcsid[] = "$Id: gnu_linux.c,v 1.29 2008/03/28 02:03:13 rocky Exp $";
#ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
#include <limits.h> #endif
#include <sys/types.h>
#include <sys/wait.h>
#include <cdio/sector.h> #include <cdio/sector.h>
#include <cdio/util.h> #include <cdio/util.h>
@@ -47,6 +46,10 @@ static const char _rcsid[] = "$Id: gnu_linux.c,v 1.28 2007/03/07 04:35:47 rocky
#ifdef HAVE_LINUX_CDROM #ifdef HAVE_LINUX_CDROM
#include <limits.h>
#include <sys/types.h>
#include <sys/wait.h>
#if defined(HAVE_LINUX_VERSION_H) #if defined(HAVE_LINUX_VERSION_H)
# include <linux/version.h> # include <linux/version.h>
# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,16) # if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,16)

220
lib/driver/netbsd.c
View File

@@ -1,5 +1,4 @@
/* $NetBSD: _cdio_netbsd.c,v 1.4 2005/05/31 17:05:36 drochner Exp $ */ /* $Id: netbsd.c,v 1.3 2008/03/28 02:03:13 rocky Exp $ */
/* Copyright (C) 2008 Rocky Bernstein <rocky@gnu.org> /* Copyright (C) 2008 Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
@@ -51,23 +50,26 @@
#include "cdio_assert.h" #include "cdio_assert.h"
#include "cdio_private.h" #include "cdio_private.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#ifdef __i386__ #ifdef __i386__
#define DEFAULT_CDIO_DEVICE "/dev/rcd0d" #define DEFAULT_CDIO_DEVICE "/dev/rcd0d"
#else #else
#define DEFAULT_CDIO_DEVICE "/dev/rcd0c" #define DEFAULT_CDIO_DEVICE "/dev/rcd0c"
#endif #endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#ifdef HAVE_NETBSD_CDROM #ifdef HAVE_NETBSD_CDROM
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/cdio.h> #include <sys/cdio.h>
#include <sys/scsiio.h> #include <sys/scsiio.h>
@@ -88,9 +90,9 @@ typedef struct {
static driver_return_code_t static driver_return_code_t
run_scsi_cmd_netbsd(void *p_user_data, unsigned int i_timeout_ms, run_scsi_cmd_netbsd(void *p_user_data, unsigned int i_timeout_ms,
unsigned int i_cdb, const mmc_cdb_t *p_cdb, unsigned int i_cdb, const mmc_cdb_t *p_cdb,
cdio_mmc_direction_t e_direction, cdio_mmc_direction_t e_direction,
unsigned int i_buf, void *p_buf ) unsigned int i_buf, void *p_buf )
{ {
const _img_private_t *_obj = p_user_data; const _img_private_t *_obj = p_user_data;
scsireq_t req; scsireq_t req;
@@ -116,8 +118,8 @@ run_scsi_cmd_netbsd(void *p_user_data, unsigned int i_timeout_ms,
} }
static int static int
_cdio_read_audio_sectors(void *user_data, void *data, lsn_t lsn, read_audio_sectors_netbsd(void *user_data, void *data, lsn_t lsn,
unsigned int nblocks) unsigned int nblocks)
{ {
scsireq_t req; scsireq_t req;
_img_private_t *_obj = user_data; _img_private_t *_obj = user_data;
@@ -153,8 +155,8 @@ _cdio_read_audio_sectors(void *user_data, void *data, lsn_t lsn,
} }
static int static int
_cdio_read_mode2_sector(void *user_data, void *data, lsn_t lsn, read_mode2_sector_netbsd(void *user_data, void *data, lsn_t lsn,
bool mode2_form2) bool mode2_form2)
{ {
scsireq_t req; scsireq_t req;
_img_private_t *_obj = user_data; _img_private_t *_obj = user_data;
@@ -196,14 +198,14 @@ _cdio_read_mode2_sector(void *user_data, void *data, lsn_t lsn,
} }
static int static int
_cdio_read_mode2_sectors(void *user_data, void *data, lsn_t lsn, 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; int i, res;
char *buf = data; char *buf = data;
for (i = 0; i < nblocks; i++) { for (i = 0; i < nblocks; i++) {
res = _cdio_read_mode2_sector(user_data, buf, lsn, mode2_form2); res = read_mode2_sector_netbsd(user_data, buf, lsn, mode2_form2);
if (res) if (res)
return res; return res;
@@ -214,30 +216,8 @@ _cdio_read_mode2_sectors(void *user_data, void *data, lsn_t lsn,
return 0; return 0;
} }
#if USE_CDIO_STAT_SIZE
static uint32_t
_cdio_stat_size(void *user_data)
{
_img_private_t *_obj = user_data;
struct ioc_read_toc_entry req;
struct cd_toc_entry tocent;
req.address_format = CD_LBA_FORMAT;
req.starting_track = 0xaa;
req.data_len = sizeof(tocent);
req.data = &tocent;
if (ioctl(_obj->gen.fd, CDIOREADTOCENTRIES, &req) < 0) {
perror("ioctl(CDIOREADTOCENTRY) leadout");
exit(EXIT_FAILURE);
}
return (tocent.addr.lba);
}
#endif
static int static int
_cdio_set_arg(void *user_data, const char key[], const char value[]) set_arg_netbsd(void *user_data, const char key[], const char value[])
{ {
_img_private_t *_obj = user_data; _img_private_t *_obj = user_data;
@@ -352,7 +332,7 @@ _cdio_read_discinfo(_img_private_t *_obj)
} }
static int static int
_cdio_eject_media(void *user_data) { eject_media_netbsd(void *user_data) {
_img_private_t *_obj = user_data; _img_private_t *_obj = user_data;
int fd, res, ret = 0; int fd, res, ret = 0;
@@ -377,8 +357,11 @@ _cdio_eject_media(void *user_data) {
return ret; return ret;
} }
/*!
Return the value associated with the key "arg".
*/
static const char * static const char *
_cdio_get_arg(void *user_data, const char key[]) get_arg_netbsd(void *user_data, const char key[])
{ {
_img_private_t *_obj = user_data; _img_private_t *_obj = user_data;
@@ -392,7 +375,7 @@ _cdio_get_arg(void *user_data, const char key[])
} }
static track_t static track_t
_cdio_get_first_track_num(void *user_data) get_first_track_num_netbsd(void *user_data)
{ {
_img_private_t *_obj = user_data; _img_private_t *_obj = user_data;
int res; int res;
@@ -407,7 +390,7 @@ _cdio_get_first_track_num(void *user_data)
} }
static track_t static track_t
_cdio_get_num_tracks(void *user_data) get_num_tracks_netbsd(void *user_data)
{ {
_img_private_t *_obj = user_data; _img_private_t *_obj = user_data;
int res; int res;
@@ -421,8 +404,11 @@ _cdio_get_num_tracks(void *user_data)
return TOTAL_TRACKS; return TOTAL_TRACKS;
} }
/*!
Get format of track.
*/
static track_format_t static track_format_t
_cdio_get_track_format(void *user_data, track_t track_num) get_track_format_netbsd(void *user_data, track_t track_num)
{ {
_img_private_t *_obj = user_data; _img_private_t *_obj = user_data;
int res; int res;
@@ -453,16 +439,33 @@ _cdio_get_track_format(void *user_data, track_t track_num)
return TRACK_FORMAT_AUDIO; return TRACK_FORMAT_AUDIO;
} }
/*!
Return true if we have XA data (green, mode2 form1) or
XA data (green, mode2 form2). That is track begins:
sync - header - subheader
12 4 - 8
FIXME: there's gotta be a better design for this and get_track_format?
*/
static bool static bool
_cdio_get_track_green(void *user_data, track_t track_num) get_track_green_netbsd(void *user_data, track_t track_num)
{ {
return (_cdio_get_track_format(user_data, track_num) return (get_track_format_netbsd(user_data, track_num)
== TRACK_FORMAT_XA); == TRACK_FORMAT_XA);
} }
/*!
Return the starting MSF (minutes/secs/frames) for track number
track_num in obj. Track numbers usually start at something
greater than 0, usually 1.
The "leadout" track is specified either by
using i_track LEADOUT_TRACK or the total tracks+1.
False is returned if there is no track entry.
*/
static bool static bool
_cdio_get_track_msf(void *user_data, track_t track_num, msf_t *msf) get_track_msf_netbsd(void *user_data, track_t track_num, msf_t *msf)
{ {
_img_private_t *_obj = user_data; _img_private_t *_obj = user_data;
int res; int res;
@@ -489,14 +492,22 @@ _cdio_get_track_msf(void *user_data, track_t track_num, msf_t *msf)
return true; return true;
} }
/*!
Return the size of the CD in logical block address (LBA) units.
@return the lsn. On error return CDIO_INVALID_LSN.
Also note that in one at least one test the corresponding MMC gives
a different answer, so there may be some disagreement about what is in
fact the last lsn.
*/
static lsn_t static lsn_t
get_disc_last_lsn_netbsd(void *user_data) get_disc_last_lsn_netbsd(void *user_data)
{ {
msf_t msf; msf_t msf;
_cdio_get_track_msf(user_data, CDIO_CDROM_LEADOUT_TRACK, &msf); get_track_msf_netbsd(user_data, CDIO_CDROM_LEADOUT_TRACK, &msf);
return (((msf.m * 60) + msf.s) * 75 + msf.f); return (((msf.m * 60) + msf.s) * CDIO_CD_FRAMES_PER_SEC + msf.f);
} }
#endif /* HAVE_NETBSD_CDROM */ #endif /* HAVE_NETBSD_CDROM */
@@ -510,17 +521,26 @@ cdio_get_devices_netbsd (void)
#endif /* HAVE_NETBSD_CDROM */ #endif /* HAVE_NETBSD_CDROM */
} }
/*!
Return a string containing the default CD device.
*/
char * char *
cdio_get_default_device_netbsd() cdio_get_default_device_netbsd()
{ {
return strdup(DEFAULT_CDIO_DEVICE); return strdup(DEFAULT_CDIO_DEVICE);
} }
/*!
Close tray on CD-ROM.
@param psz_device the CD-ROM drive to be closed.
*/
driver_return_code_t driver_return_code_t
close_tray_netbsd (const char *psz_device) close_tray_netbsd (const char *psz_device)
{ {
#ifdef HAVE_NETBSD_CDROM #ifdef HAVE_NETBSD_CDROM
return DRIVER_OP_SUCCESS; return DRIVER_OP_UNSUPPORTED;
#else #else
return DRIVER_OP_NO_DRIVER; return DRIVER_OP_NO_DRIVER;
#endif #endif
@@ -528,44 +548,52 @@ close_tray_netbsd (const char *psz_device)
#ifdef HAVE_NETBSD_CDROM #ifdef HAVE_NETBSD_CDROM
static cdio_funcs_t _funcs = { static cdio_funcs_t _funcs = {
.eject_media = _cdio_eject_media, .audio_read_subchannel = audio_read_subchannel_mmc,
.free = cdio_generic_free, .eject_media = eject_media_netbsd,
.get_arg = _cdio_get_arg, .free = cdio_generic_free,
.get_cdtext = get_cdtext_generic, .get_arg = get_arg_netbsd,
.get_default_device = cdio_get_default_device_netbsd, .get_blocksize = get_blocksize_mmc,
.get_devices = cdio_get_devices_netbsd, .get_cdtext = get_cdtext_generic,
.get_disc_last_lsn = get_disc_last_lsn_netbsd, .get_default_device = cdio_get_default_device_netbsd,
.get_discmode = get_discmode_generic, .get_devices = cdio_get_devices_netbsd,
.get_drive_cap = get_drive_cap_mmc, .get_disc_last_lsn = get_disc_last_lsn_netbsd,
.get_first_track_num= _cdio_get_first_track_num, .get_discmode = get_discmode_generic,
.get_mcn = get_mcn_mmc, .get_drive_cap = get_drive_cap_mmc,
.get_num_tracks = _cdio_get_num_tracks, .get_first_track_num = get_first_track_num_netbsd,
.get_track_format = _cdio_get_track_format, .get_hwinfo = NULL,
.get_track_green = _cdio_get_track_green, .get_mcn = get_mcn_mmc,
.get_track_lba = NULL, .get_num_tracks = get_num_tracks_netbsd,
.get_track_msf = _cdio_get_track_msf, .get_track_channels = get_track_channels_generic,
.lseek = cdio_generic_lseek, .get_track_copy_permit = get_track_copy_permit_generic,
.read = cdio_generic_read, .get_track_format = get_track_format_netbsd,
.read_audio_sectors = _cdio_read_audio_sectors, .get_track_green = get_track_green_netbsd,
.read_data_sectors = read_data_sectors_generic, .get_track_lba = NULL, /* This could be implemented if need be. */
.read_mode2_sector = _cdio_read_mode2_sector, .get_track_preemphasis = get_track_preemphasis_generic,
.read_mode2_sectors = _cdio_read_mode2_sectors, .get_track_msf = get_track_msf_netbsd,
.read_toc = read_toc_netbsd, .lseek = cdio_generic_lseek,
.read = cdio_generic_read,
.read_audio_sectors = read_audio_sectors_netbsd,
.read_data_sectors = read_data_sectors_generic,
.read_mode2_sector = read_mode2_sector_netbsd,
.read_mode2_sectors = read_mode2_sectors_netbsd,
.read_toc = read_toc_netbsd,
#if 1 #if 1
.run_mmc_cmd = run_scsi_cmd_netbsd, .run_mmc_cmd = run_scsi_cmd_netbsd,
#endif
.set_arg = _cdio_set_arg,
#if USE_CDIO_STAT_SIZE
.stat_size = _cdio_stat_size
#endif #endif
.set_arg = set_arg_netbsd,
}; };
#endif /*HAVE_NETBSD_CDROM*/ #endif /*HAVE_NETBSD_CDROM*/
CdIo * /*!
Initialization routine. This is the only thing that doesn't
get called via a function pointer. In fact *we* are the
ones to set that up.
*/
CdIo_t *
cdio_open_netbsd(const char *source_name) cdio_open_netbsd(const char *source_name)
{ {
#ifdef HAVE_NETBSD_CDROM #ifdef HAVE_NETBSD_CDROM
CdIo *ret; CdIo_t *ret;
_img_private_t *_data; _img_private_t *_data;
_data = calloc(1, sizeof(_img_private_t)); _data = calloc(1, sizeof(_img_private_t));
@@ -574,8 +602,8 @@ cdio_open_netbsd(const char *source_name)
_data->toc_valid = false; _data->toc_valid = false;
_data->sessionformat_valid = false; _data->sessionformat_valid = false;
_cdio_set_arg(_data, "source", set_arg_netbsd(_data, "source",
(source_name ? source_name : DEFAULT_CDIO_DEVICE)); (source_name ? source_name : DEFAULT_CDIO_DEVICE));
if (source_name && !cdio_is_device_generic(source_name)) if (source_name && !cdio_is_device_generic(source_name))
return (NULL); return (NULL);
@@ -595,7 +623,12 @@ cdio_open_netbsd(const char *source_name)
#endif /* HAVE_BSDI_CDROM */ #endif /* HAVE_BSDI_CDROM */
} }
CdIo * /*!
Initialization routine. This is the only thing that doesn't
get called via a function pointer. In fact *we* are the
ones to set that up.
*/
CdIo_t *
cdio_open_am_netbsd(const char *source_name, const char *am) cdio_open_am_netbsd(const char *source_name, const char *am)
{ {
return (cdio_open_netbsd(source_name)); return (cdio_open_netbsd(source_name));
@@ -610,3 +643,12 @@ cdio_have_netbsd (void)
return false; return false;
#endif /* HAVE_NETBSD_CDROM */ #endif /* HAVE_NETBSD_CDROM */
} }
/*
* Local variables:
* c-file-style: "gnu"
* tab-width: 8
* indent-tabs-mode: nil
* End:
*/