1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-20 08:27:15 +00:00

[patch] multimedia/pvr250: unbreak on -CURRENT

newbus API has changed. patch accordingly.

PR:		ports/116128
Submitted by:	Simun Mikecin <numisemis@yahoo.com>
Approved by:	edwin@
This commit is contained in:
Edwin Groothuis 2007-09-06 01:13:37 +00:00
parent d36ba0538a
commit d63c56db88
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=198881
3 changed files with 36 additions and 0 deletions

View File

@ -39,6 +39,11 @@ MODULESDIR= /boot/kernel
.endif
PLIST_SUB= MODULESDIR=${MODULESDIR}
.if ${OSVERSION} >= 700031
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-dev::cxm::cxm.h \
${PATCHDIR}/extra-patch-dev::cxm::cxm.c
.endif
.if !exists(${DISTDIR}/hcwPVRP2.sys)
IGNORE= You need the file hcwPVRP2.sys from the CD coming with the PVR-250/350 card. Please place this file in ${DISTDIR} and run make again.
.endif

View File

@ -0,0 +1,11 @@
--- dev/cxm/cxm.c.orig 2007-09-05 19:08:24.707875447 +0200
+++ dev/cxm/cxm.c 2007-09-05 19:08:17.000000000 +0200
@@ -1799,7 +1799,7 @@
}
error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_TTY,
- cxm_intr, sc, &sc->ih_cookie);
+ NULL, cxm_intr, sc, &sc->ih_cookie);
if (error) {
device_printf(dev, "could not setup irq\n");
goto fail;

View File

@ -0,0 +1,20 @@
--- dev/cxm/cxm.h.orig 2007-09-05 19:10:08.361061000 +0200
+++ dev/cxm/cxm.h 2007-09-05 19:14:25.486827125 +0200
@@ -211,8 +211,6 @@
cxm_pal_60hz_source_format,
cxm_secam_50hz_source_format };
-extern const struct cxm_tuner cxm_tuners[];
-
enum cxm_type { cxm_unknown_type, cxm_iTVC15_type, cxm_iTVC16_type };
/*
@@ -635,6 +633,8 @@
const struct cxm_saa7115_command *scaling;
};
+extern const struct cxm_tuner cxm_tuners[];
+
int cxm_saa7115_init( struct cxm_softc *sc );
int cxm_saa7115_mute( struct cxm_softc *sc );
int cxm_saa7115_unmute( struct cxm_softc *sc );