[MPlayer-users] NetBSD patches for 0.90pre1
Bernd Ernesti
mplayer at lists.veego.de
Sat Apr 27 18:11:01 CEST 2002
Hi,
here are some NetBSD patches.
- patch-ao_oss (libao2/ao_oss.c):
NetBSD has some ossaudio support but doesn't have all defines,
thats why I added the ifdef in libao2/ao_oss.c
- patch-configure:
- 1st first chunk: is needed to set the runtime library path, thats
maybe a problem with some ld's, so it is up to you what you do with
it.
- 2nd chunk: NetBSD has as I said above ossaudio support, but use
/dev/sound instead of /dev/dsp
- 3rd chunk: Also enable HAVE_VCD on NetBSD
- 4th chunk: Enable the bt848 support on NetBSD
- 5th chunk: NetBSD needs to link with -li386 and -lossaudio, the
later is the ossaudio compat library and the former is needed for
i386_set_ldt and i386_mtrr
- patch-mtrr (libdha/mtrr.c):
Experimental MTRR support for NetBSD, it should work, but it seems that
the current source doesn't use mtrr_set_type at all, at least not on
NetBSD. I only added the code because I saw a #warning in the build log.
- patch-stream (libmpdemux/stream.c):
Use a different vcd_read*.h file on NetBSD, this was done by
Sergey Svishchev <svs at ropnet.ru>. Please see the new vcd_read_nbsd.h
file.
- patch-tvi_bsdbt848 (libmpdemux/tvi_bsdbt848.c):
NetBSD use a different include file. This compiles, but I didn't test
it yet.
- vcd_read_nbsd.h:
Needed for libmpdemux/stream.c
Regards,
Bernd
-------------- next part --------------
--- libao2/ao_oss.c.orig Tue Mar 19 20:16:01 2002
+++ libao2/ao_oss.c Fri Apr 26 11:12:49 2002
@@ -286,9 +286,11 @@
static float get_delay(){
/* Calculate how many bytes/second is sent out */
if(audio_delay_method==2){
+#ifdef SNDCTL_DSP_GETODELAY
int r=0;
if(ioctl(audio_fd, SNDCTL_DSP_GETODELAY, &r)!=-1)
return ((float)r)/(float)ao_data.bps;
+#endif
audio_delay_method=1; // fallback if not supported
}
if(audio_delay_method==1){
-------------- next part --------------
--- configure.orig Sat Apr 20 21:42:47 2002
+++ configure Fri Apr 26 13:25:20 2002
@@ -259,7 +259,7 @@
_inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
;;
--with-extralibdir=*)
- _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
+ _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
;;
--enable-runtime-cpudetection)
_runtime_cpudetection=yes
@@ -2321,7 +2321,11 @@
_def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound/dsp"'
_def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/sound/mixer"'
else
- _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
+ if netbsd ; then
+ _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"'
+ else
+ _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
+ fi
_def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/mixer"'
fi
else
@@ -2438,7 +2442,7 @@
echocheck "VCD support"
-if linux || bsdos || freebsd || sunos ; then
+if linux || bsdos || freebsd || netbsd || sunos ; then
_inputmodules="vcd $_inputmodules"
_def_vcd='#define HAVE_VCD 1'
echores "ok"
@@ -3056,7 +3060,11 @@
if test "$_tv" = yes ; then
cat > $TMPC <<EOF
#include <sys/types.h>
+#ifdef __NetBSD__
+#include <dev/ic/bt8xx.h>
+#else
#include <machine/ioctl_bt848.h>
+#endif
int main(void) { return 0; }
EOF
cc_check && _tv_bsdbt848=yes
@@ -3284,6 +3292,7 @@
_ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic"
bsdos && _ld_arch="$_ld_arch -ldvd"
+netbsd && _ld_arch="$_ld_arch -li386 -lossaudio"
_def_debug='#undef MP_DEBUG'
test "$_debug" && _def_debug='#define MP_DEBUG 1'
-------------- next part --------------
--- libdha/mtrr.c.orig Sun Feb 3 14:19:39 2002
+++ libdha/mtrr.c Fri Apr 26 17:08:54 2002
@@ -12,6 +12,12 @@
#include "libdha.h"
#include "AsmMacros.h"
+#if defined (__i386__) && defined (__NetBSD__)
+#include <stdint.h>
+#include <stdlib.h>
+#include <machine/mtrr.h>
+#include <machine/sysarch.h>
+#endif
#if defined( __i386__ )
int mtrr_set_type(unsigned base,unsigned size,int type)
@@ -40,6 +46,23 @@
return wr_len == strlen(sout) ? 0 : EPERM;
}
return ENOSYS;
+#elif defined (__NetBSD__)
+ struct mtrr *mtrrp;
+ int n;
+
+ mtrrp = malloc(sizeof (struct mtrr));
+ mtrrp->base = base;
+ mtrrp->len = size;
+ mtrrp->type = type;
+ mtrrp->flags = MTRR_VALID | MTRR_PRIVATE;
+ n = 1;
+
+ if (i386_set_mtrr(mtrrp, &n) < 0) {
+ free(mtrrp);
+ return errno;
+ }
+ free(mtrrp);
+ return 0;
#else
#warning Please port MTRR stuff!!!
return ENOSYS;
-------------- next part --------------
--- libmpdemux/stream.c.orig Wed Apr 3 19:55:31 2002
+++ libmpdemux/stream.c Fri Apr 26 11:09:26 2002
@@ -22,6 +22,8 @@
#ifdef __FreeBSD__
#include "vcd_read_fbsd.h"
+#elif defined(__NetBSD__)
+#include "vcd_read_nbsd.h"
#else
#include "vcd_read.h"
#endif
-------------- next part --------------
--- libmpdemux/tvi_bsdbt848.c.orig Fri Apr 12 12:40:38 2002
+++ libmpdemux/tvi_bsdbt848.c Fri Apr 26 13:22:25 2002
@@ -39,8 +39,12 @@
#include <signal.h>
#include <string.h>
+#ifdef __NetBSD__
+#include <dev/ic/bt8xx.h>
+#else
#include <machine/ioctl_meteor.h>
#include <machine/ioctl_bt848.h>
+#endif
#ifdef HAVE_SYS_SOUNDCARD_H
#include <sys/soundcard.h>
-------------- next part --------------
/* $NetBSD: vcd_read_nbsd.c,v 1.1 2001/12/26 00:58:05 zuntum Exp $ */
#include <sys/types.h>
#include <sys/inttypes.h>
#include <sys/cdio.h>
#include <sys/scsiio.h>
#define CDROM_LEADOUT 0xAA
static struct ioc_read_toc_entry vcd_entry;
static struct cd_toc_entry vcd_entry_data;
static char vcd_buf[VCD_SECTOR_SIZE];
static inline void
vcd_set_msf(unsigned int sect)
{
unsigned int s = sect;
vcd_entry_data.addr.msf.frame = sect % 75;
sect = sect / 75;
vcd_entry_data.addr.msf.second = sect % 60;
sect = sect / 60;
vcd_entry_data.addr.msf.minute = sect;
}
static inline unsigned int
vcd_get_msf()
{
return vcd_entry_data.addr.msf.frame +
(vcd_entry_data.addr.msf.second +
vcd_entry_data.addr.msf.minute * 60) * 75;
}
int
vcd_seek_to_track(int fd, int track)
{
vcd_entry.address_format = CD_MSF_FORMAT;
vcd_entry.starting_track = track;
vcd_entry.data_len = sizeof(struct cd_toc_entry);
vcd_entry.data = &vcd_entry_data;
if (ioctl(fd, CDIOREADTOCENTRIES, &vcd_entry)) {
perror("ioctl dif1");
return -1;
}
return VCD_SECTOR_DATA * vcd_get_msf();
}
int
vcd_get_track_end(int fd, int track)
{
struct ioc_toc_header tochdr;
if (ioctl(fd, CDIOREADTOCHEADER, &tochdr) == -1) {
perror("read CDROM toc header: ");
return -1;
}
vcd_entry.address_format = CD_MSF_FORMAT;
vcd_entry.starting_track = track < tochdr.ending_track ? (track + 1) : CDROM_LEADOUT;
vcd_entry.data_len = sizeof(struct cd_toc_entry);
vcd_entry.data = &vcd_entry_data;
if (ioctl(fd, CDIOREADTOCENTRYS, &vcd_entry)) {
perror("ioctl dif2");
return -1;
}
return VCD_SECTOR_DATA * vcd_get_msf();
}
void
vcd_read_toc(int fd)
{
struct ioc_toc_header tochdr;
int i;
if (ioctl(fd, CDIOREADTOCHEADER, &tochdr) == -1) {
perror("read CDROM toc header: ");
return;
}
for (i = tochdr.starting_track; i <= tochdr.ending_track; i++) {
struct ioc_read_toc_entry tocentry;
struct cd_toc_entry tocentry_data;
tocentry.starting_track = i;
tocentry.address_format = CD_MSF_FORMAT;
tocentry.data_len = sizeof(struct cd_toc_entry);
tocentry.data = &tocentry_data;
if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry) == -1) {
perror("read CDROM toc entry: ");
return;
}
printf("track %02d: adr=%d ctrl=%d format=%d %02d:%02d:%02d\n",
(int) tocentry.starting_track,
(int) tocentry.data->addr_type,
(int) tocentry.data->control,
(int) tocentry.address_format,
(int) tocentry.data->addr.msf.minute,
(int) tocentry.data->addr.msf.second,
(int) tocentry.data->addr.msf.frame
);
}
}
static int
vcd_read(int fd, char *mem)
{
struct scsireq sc;
int lba = vcd_get_msf();
int blocks;
int sector_type;
int sync, header_code, user_data, edc_ecc, error_field;
int sub_channel;
int rc;
blocks = 1;
sector_type = 5; /* mode2/form2 */
sync = 0;
header_code = 0;
user_data = 1;
edc_ecc = 0;
error_field = 0;
sub_channel = 0;
memset(&sc, 0, sizeof(sc));
sc.cmd[0] = 0xBE;
sc.cmd[1] = (sector_type) << 2;
sc.cmd[2] = (lba >> 24) & 0xff;
sc.cmd[3] = (lba >> 16) & 0xff;
sc.cmd[4] = (lba >> 8) & 0xff;
sc.cmd[5] = lba & 0xff;
sc.cmd[6] = (blocks >> 16) & 0xff;
sc.cmd[7] = (blocks >> 8) & 0xff;
sc.cmd[8] = blocks & 0xff;
sc.cmd[9] = (sync << 7) | (header_code << 5) | (user_data << 4) |
(edc_ecc << 3) | (error_field << 1);
sc.cmd[10] = sub_channel;
sc.cmdlen = 12;
sc.databuf = (caddr_t) mem;
sc.datalen = 2328;
sc.senselen = sizeof(sc.sense);
sc.flags = SCCMD_READ;
sc.timeout = 10000;
rc = ioctl(fd, SCIOCCOMMAND, &sc);
if (rc == -1) {
perror("SCIOCCOMMAND");
return -1;
}
if (sc.retsts || sc.error) {
fprintf(stderr, "scsi command failed: status %d error %d\n", sc.retsts,
sc.error);
return -1;
}
return VCD_SECTOR_DATA;
}
#ifdef VCD_CACHE
static int vcd_cache_size = 0;
static char *vcd_cache_data = NULL;
static int *vcd_cache_sectors = NULL;
static int vcd_cache_index = 0;
static int vcd_cache_current = -1;
void
vcd_cache_init(int s)
{
vcd_cache_size = s;
vcd_cache_sectors = malloc(s * sizeof(int));
vcd_cache_data = malloc(s * VCD_SECTOR_SIZE);
memset(vcd_cache_sectors, 255, s * sizeof(int));
}
static inline void
vcd_cache_seek(int sect)
{
vcd_cache_current = sect;
}
int
vcd_cache_read(int fd, char *mem)
{
int i;
char *vcd_buf;
for (i = 0; i < vcd_cache_size; i++)
if (vcd_cache_sectors[i] == vcd_cache_current) {
vcd_buf = &vcd_cache_data[i * VCD_SECTOR_SIZE];
++vcd_cache_current;
memcpy(mem, &vcd_buf[VCD_SECTOR_OFFS], VCD_SECTOR_DATA);
return VCD_SECTOR_DATA;
}
vcd_buf = &vcd_cache_data[vcd_cache_index * VCD_SECTOR_SIZE];
vcd_cache_sectors[vcd_cache_index] = vcd_cache_current;
++vcd_cache_index;
if (vcd_cache_index >= vcd_cache_size)
vcd_cache_index = 0;
vcd_set_msf(vcd_cache_current);
memcpy(vcd_buf, &vcd_entry_data.addr.msf, sizeof(vcd_entry_data.addr.msf));
++vcd_cache_current;
memcpy(mem, &vcd_buf[VCD_SECTOR_OFFS], VCD_SECTOR_DATA);
return VCD_SECTOR_DATA;
}
#endif
More information about the MPlayer-users
mailing list