Date: Sat, 22 May 2010 14:58:58 +0200 From: Torfinn Ingolfsen <torfinn.ingolfsen@broadpark.no> To: freebsd-multimedia@FreeBSD.org Subject: Re: usleep's pvrxxx port and FreeBSD 8.0-stable Message-ID: <20100522145858.fe653d29.torfinn.ingolfsen@broadpark.no> In-Reply-To: <20100522130442.7dd0c114.torfinn.ingolfsen@broadpark.no> References: <20100520215645.0f506ba7.torfinn.ingolfsen@broadpark.no> <20100521105145.56bcd718.torfinn.ingolfsen@broadpark.no> <20100521165407.5a7da822.torfinn.ingolfsen@broadpark.no> <201005212042.42604.shoesoft@gmx.net> <20100522130442.7dd0c114.torfinn.ingolfsen@broadpark.no>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --Boundary_(ID_wgu3NhInTZE0ZJ7fn1bXJg) Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Update: Ok, I have tested the port with mplayer, and it works (at least for video, for some reason my quick test didn't have any audio. Might be a problem with mplayer). attached is a patch for the port at http://usleepless.110mb.com/pvrxxx_port.tgz This patch includes the necessary fixes to make the port compile under FreeBSD 8.x (thanks to Stefan Ehmann). You still need to do 'make WERROR=', and that should probably also be corrected, but I don't know how to do that. After that it is make install as usual. -- Torfinn --Boundary_(ID_wgu3NhInTZE0ZJ7fn1bXJg) Content-type: text/x-diff; name=pvrxxx-09042008-patch.diff Content-transfer-encoding: 7BIT Content-disposition: attachment; filename=pvrxxx-09042008-patch.diff ===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/multimedia/pvrxxx-09042008/files/patch-dev /usr/ports/multimedia/pvrxxx/files/patch-dev --- /usr/ports/multimedia/pvrxxx-09042008/files/patch-dev 2008-04-11 16:52:18.000000000 +0200 +++ /usr/ports/multimedia/pvrxxx/files/patch-dev 2010-05-22 14:27:16.000000000 +0200 @@ -1362,9 +1362,9 @@ return 0; Only in dev/cxm: cxm.c.orig diff -ur ../work.orig/dev/cxm/cxm.h dev/cxm/cxm.h ---- ../work.orig/dev/cxm/cxm.h 2008-04-11 16:52:17.000000000 +0200 -+++ dev/cxm/cxm.h 2008-04-09 20:45:33.000000000 +0200 -@@ -33,10 +33,23 @@ +--- dev/cxm/cxm.h.orig ++++ dev/cxm/cxm.h +@@ -33,10 +33,26 @@ * Header file for the Conexant MPEG-2 Codec driver. */ @@ -1385,10 +1385,13 @@ +#include <sys/taskqueue.h> +#endif + ++#undef minor ++#define minor(d) ((d) ? (d)->si_drv0 : -1) ++ #define bswap32(X) ntohl(X) #define NUM_ELEMENTS(array) (sizeof(array) / sizeof(*array)) -@@ -64,7 +77,7 @@ +@@ -64,7 +80,7 @@ enum cxm_byte_order byte_order; }; @@ -1397,7 +1400,7 @@ struct cxm_buffer_pool { bus_dma_tag_t dmat; -@@ -183,7 +196,8 @@ +@@ -183,7 +199,8 @@ * that the size of each piece must be a multiple of * 256 and less than 64k. */ @@ -1407,7 +1410,7 @@ struct cxm_sg_entry { u_int32_t src; -@@ -211,9 +225,10 @@ +@@ -211,9 +228,10 @@ cxm_pal_60hz_source_format, cxm_secam_50hz_source_format }; @@ -1419,7 +1422,7 @@ /* * Conexant iTVC15 / iTVC16 info structure, one per card installed. -@@ -221,6 +236,7 @@ +@@ -221,6 +239,7 @@ struct cxm_softc { enum cxm_type type; char name[10]; /* Device name and unit number */ @@ -1427,7 +1430,7 @@ struct resource *mem_res; /* Resource descriptor for registers */ bus_space_tag_t btag; /* Bus space access functions */ -@@ -243,6 +259,8 @@ +@@ -243,6 +262,8 @@ unsigned int dec_mbx; unsigned int enc_mbx; @@ -1436,7 +1439,7 @@ device_t cxm_iic; device_t iicbus; -@@ -254,7 +272,7 @@ +@@ -254,7 +275,7 @@ char msp_name[10]; @@ -1445,7 +1448,7 @@ enum cxm_source source; -@@ -266,6 +284,16 @@ +@@ -266,6 +287,16 @@ int encoding; int encoding_dma; int encoding_eos; @@ -1462,7 +1465,7 @@ }; /* -@@ -434,7 +462,7 @@ +@@ -434,7 +465,7 @@ #define CXM_FW_CAPTURE_STREAM_PCM_AUDIO 0x00000002 #define CXM_FW_CAPTURE_STREAM_VBI 0x00000004 @@ -1471,7 +1474,7 @@ #define CXM_FW_STREAM_TYPE_MPEG1 0x00000002 #define CXM_FW_STREAM_TYPE_MPEG2_PROGRAM 0x00000000 #define CXM_FW_STREAM_TYPE_SVCD 0x0000000c -@@ -463,6 +491,7 @@ +@@ -463,6 +494,7 @@ */ int cxm_eeprom_init( struct cxm_softc *sc ); int cxm_eeprom_tuner_type( struct cxm_softc *sc ); @@ -1479,7 +1482,7 @@ /* * Infrared remote -@@ -521,8 +550,11 @@ +@@ -521,8 +553,11 @@ #define CXM_TUNER_LG_TAPE_H001F 18 #define CXM_TUNER_MICROTUNE_4049_FM5 19 #define CXM_TUNER_TCL_2002N_6A 20 @@ -1492,7 +1495,7 @@ #define CXM_TUNER_AFC_MASK 0x07 -@@ -656,3 +688,7 @@ +@@ -656,3 +691,7 @@ int cxm_saa7115_set_hue( struct cxm_softc *sc, unsigned char hue ); int cxm_saa7115_is_locked( struct cxm_softc *sc ); int cxm_saa7115_wait_for_lock( struct cxm_softc *sc ); @@ -1698,9 +1701,17 @@ exit (0); } diff -ur ../work.orig/dev/cxm/cxm_i2c.c dev/cxm/cxm_i2c.c ---- ../work.orig/dev/cxm/cxm_i2c.c 2008-04-11 16:52:17.000000000 +0200 -+++ dev/cxm/cxm_i2c.c 2006-08-23 21:13:52.000000000 +0200 -@@ -375,6 +375,7 @@ +--- dev/cxm/cxm_i2c.c.orig ++++ dev/cxm/cxm_i2c.c +@@ -131,6 +131,7 @@ + #endif + MODULE_VERSION(cxm_iic, 1); + DRIVER_MODULE(cxm_iic, cxm, cxm_iic_driver, cxm_iic_devclass, 0, 0); ++DRIVER_MODULE(iicbb, cxm_iic, iicbb_driver, iicbb_devclass, 0, 0); + + + /* +@@ -375,6 +376,7 @@ */ (void)CSR_READ_4(sc, CXM_REG_I2C_SETSCL); @@ -1708,7 +1719,7 @@ } -@@ -396,6 +397,7 @@ +@@ -396,6 +398,7 @@ */ (void)CSR_READ_4(sc, CXM_REG_I2C_SETSDA); @@ -1716,7 +1727,7 @@ } -@@ -408,6 +410,6 @@ +@@ -408,6 +411,6 @@ cxm_iic_setsda(dev, data); /* Wait for 10 usec */ ===> Done --Boundary_(ID_wgu3NhInTZE0ZJ7fn1bXJg)--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100522145858.fe653d29.torfinn.ingolfsen>