| 89e803c7 | 2019-08-14 13:09:47 | OBATA Akio |
Split CD support for NetBSD from FreeBSD Signed-off-by: OBATA Akio <obache@...> |
||
|
A kscd/libwm/plat_netbsd.c M kscd/libwm/CMakeLists.txt M kscd/libwm/plat_freebsd.c |
||
kscd/libwm/CMakeLists.txtdiff --git a/kscd/libwm/CMakeLists.txt b/kscd/libwm/CMakeLists.txt index 7e63270..4613f54 100644 --- a/kscd/libwm/CMakeLists.txt +++ b/kscd/libwm/CMakeLists.txt @@ -28,8 +28,8 @@ cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c plat_aix.c plat_bsd386.c plat_freebsd.c plat_hpux.c plat_irix.c - plat_linux.c plat_svr4.c plat_ultrix.c plat_news.c plat_openbsd.c - plat_osf1.c plat_sun.c plat_scor5.c + plat_linux.c plat_netbsd.c plat_svr4.c plat_ultrix.c plat_news.c + plat_openbsd.c plat_osf1.c plat_sun.c plat_scor5.c drv_sony.c drv_toshiba.c EMBED workmanaudio-static kscd/libwm/plat_freebsd.cdiff --git a/kscd/libwm/plat_freebsd.c b/kscd/libwm/plat_freebsd.c index a905ff5..b400fd6 100644 --- a/kscd/libwm/plat_freebsd.c +++ b/kscd/libwm/plat_freebsd.c @@ -30,7 +30,7 @@ * */ -#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__DragonFly__) #include <errno.h> #include <stdio.h> kscd/libwm/plat_netbsd.cdiff --git a/kscd/libwm/plat_netbsd.c b/kscd/libwm/plat_netbsd.c new file mode 100644 index 0000000..2e326eb --- /dev/null +++ b/kscd/libwm/plat_netbsd.c @@ -0,0 +1,534 @@ +/* + * This file is part of WorkMan, the civilized CD player library + * (c) 1991-1997 by Steven Grimm (original author) + * (c) by Dirk F�rsterling (current 'author' = maintainer) + * The maintainer can be contacted by his e-mail address: + * milliByte@... + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * + * plat_netbsd.c + * + * NetBSD-specific drive control routines. (Based on plat_freebsd.c) + * + * Todd Pfaff, 3/20/94 + * + */ + +#if defined(__NetBSD__) + +#include <errno.h> +#include <stdio.h> +#include <fcntl.h> +#include <string.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/param.h> +#include <sys/mount.h> +#include <sys/stat.h> +#include <sys/statvfs.h> + +#include "include/wm_config.h" + +#include <sys/time.h> +#include <sys/ioctl.h> +#include <sys/cdio.h> + +#include "include/wm_struct.h" +#include "include/wm_platform.h" +#include "include/wm_cdrom.h" +#include "include/wm_scsi.h" +#include "include/wm_helpers.h" +#include "include/wm_cdtext.h" + +#define WM_MSG_CLASS WM_MSG_CLASS_PLATFORM + +int min_volume = 10; +int max_volume = 255; + + +/*--------------------------------------------------------* + * Initialize the drive. A no-op for the generic driver. + *--------------------------------------------------------*/ +int +gen_init(struct wm_drive *d) +{
+ return (0); +} /* gen_init() */ + + +/*-------------------------------------------------------------------* + * Open the CD device and figure out what kind of drive is attached. + *-------------------------------------------------------------------*/ +int +wmcd_open( struct wm_drive *d ) +{
+ int fd; + static int warned = 0; + char vendor[32] = WM_STR_GENVENDOR; + char model[32] = WM_STR_GENMODEL; + char rev[32] = WM_STR_GENREV; + + if (d->fd >= 0) /* Device already open? */ + {
+ wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "wmcd_open(): [device is open (fd=%d)]\n", d->fd); + return (0); + } + + if (d->cd_device == NULL) + d->cd_device = DEFAULT_CD_DEVICE; + + d->fd = open(d->cd_device, 0); + if (d->fd < 0) + {
+ if (errno == EACCES) + {
+ return -EACCES; + } + + /* No CD in drive. */ + return (1); + } + + /* Now fill in the relevant parts of the wm_drive structure. */ + fd = d->fd; + + find_drive_struct(vendor, model, rev); + + /*(d->init)(d); */ + + d->fd = fd; + + return (0); +} /* wmcd_open() */ + +/* + * Re-Open the device if it is open. + */ +int +wmcd_reopen( struct wm_drive *d ) +{
+ int status; + + do {
+ wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "wmcd_reopen\n"); + status = gen_close( d ); + wm_susleep( 1000 ); + wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "calling wmcd_open()\n"); + status = wmcd_open( d ); /* open it as usual */ + wm_susleep( 1000 ); + if(status == -EACCES || status == 1) + return status; + } while ( status != 0 ); + return status; +} /* wmcd_reopen() */ + +/*---------------------------------------------* + * Send an arbitrary SCSI command to a device. + * + *---------------------------------------------*/ +int +wm_scsi(struct wm_drive *d, unsigned char *cdb, int cdblen, + void *retbuf, int retbuflen, int getreply) +{
+ return (-1); +} /* wm_scsi() */ + +int +gen_close( struct wm_drive *d ) +{
+ if(d->fd != -1) {
+ wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "closing the device\n"); + close(d->fd); + d->fd = -1; + } + return 0; +} + +/*--------------------------------------------------------------------------* + * Get the current status of the drive: the current play mode, the absolute + * position from start of disc (in frames), and the current track and index + * numbers if the CD is playing or paused. + *--------------------------------------------------------------------------*/ +int +gen_get_drive_status(struct wm_drive *d, int oldmode, + int *mode, int *pos, int *track, int *index) +{
+ int ready; + + struct ioc_read_subchannel sc; + struct cd_sub_channel_info scd; + + *mode = WM_CDM_UNKNOWN; + + sc.address_format = CD_MSF_FORMAT; + sc.data_format = CD_CURRENT_POSITION; + sc.track = 0; + sc.data_len = sizeof(scd); + sc.data = (struct cd_sub_channel_info *)&scd; + + /* Is the device open? */ + if (d->fd < 0) + {
+ switch (wmcd_open(d)) + {
+ case -1: /* error */ + return (-1); + + case 1: /* retry */ + return (0); + } + } + + ready = 0; + if (ioctl(d->fd, DIOCTUR, &ready) == -1) + {
+ *mode = WM_CDM_UNKNOWN; + return (0); + } + if (ready == 0) + {
+ *mode = WM_CDM_NO_DISC; + return (0); + } + + if (ioctl(d->fd, CDIOCREADSUBCHANNEL, &sc) == -1) + {
+ *mode = WM_CDM_UNKNOWN; + return (0); + } + + switch (scd.header.audio_status) + {
+ case CD_AS_PLAY_IN_PROGRESS:** Diff limit reached (max: 250 lines) ** |
||