rpms/libcrystalhd/devel libcrystalhd-updates.patch, NONE, 1.1 libcrystalhd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Jarod Wilson jwilson at fedoraproject.org
Thu Mar 11 15:16:29 UTC 2010


Author: jwilson

Update of /cvs/pkgs/rpms/libcrystalhd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19936

Modified Files:
	.cvsignore sources 
Added Files:
	libcrystalhd-updates.patch libcrystalhd.spec 
Log Message:
* Thu Mar 11 2010 Jarod Wilson <jarod at redhat.com> - 0.9.25-2
- Minor fixups to the as-yet-not-enabled firmware sub-package
- Initial import into Fedora


libcrystalhd-updates.patch:
 b/.gitignore                                        |   72 
 b/driver/linux/.gitignore                           |    6 
 b/driver/linux/20-crystalhd.rules                   |    1 
 b/driver/linux/Makefile.in                          |   84 
 b/driver/linux/bcm_70012_dev.sh                     |  112 
 b/driver/linux/bcm_70012_run.sh                     |   94 
 b/driver/linux/configure.ac                         |   30 
 b/driver/linux/crystalhd_cmds.c                     | 2119 -
 b/driver/linux/crystalhd_cmds.h                     |  176 
 b/driver/linux/crystalhd_fw_if.h                    |  740 
 b/driver/linux/crystalhd_hw.c                       | 4789 +--
 b/driver/linux/crystalhd_hw.h                       |  796 
 b/driver/linux/crystalhd_lnx.c                      | 1542 -
 b/driver/linux/crystalhd_lnx.h                      |  190 
 b/driver/linux/crystalhd_misc.c                     | 2079 -
 b/driver/linux/crystalhd_misc.h                     |  457 
 b/examples/build.sh                                 |    4 
 b/examples/hellobcm.cpp                             |  558 
 b/examples/mpeg2test.cpp                            |  558 
 b/export-driver-for-staging.sh                      |   40 
 b/filters/gst/gst-plugin/AUTHORS                    |   34 
 b/filters/gst/gst-plugin/COPYING                    | 1008 
 b/filters/gst/gst-plugin/INSTALL                    |  474 
 b/filters/gst/gst-plugin/Makefile                   | 1310 
 b/filters/gst/gst-plugin/Makefile.am                |    6 
 b/filters/gst/gst-plugin/Makefile.in                | 1310 
 b/filters/gst/gst-plugin/aclocal.m4                 |17966 ++++++------
 b/filters/gst/gst-plugin/autogen.sh                 |  182 
 b/filters/gst/gst-plugin/autom4te.cache/output.0    |27738 ++++++++++----------
 b/filters/gst/gst-plugin/autom4te.cache/output.1    |27730 +++++++++----------
 b/filters/gst/gst-plugin/autom4te.cache/requests    |  560 
 b/filters/gst/gst-plugin/autom4te.cache/traces.0    | 4960 +--
 b/filters/gst/gst-plugin/autom4te.cache/traces.1    | 1206 
 b/filters/gst/gst-plugin/autoregen.sh               |    4 
 b/filters/gst/gst-plugin/config.guess               | 3052 +-
 b/filters/gst/gst-plugin/config.h                   |  132 
 b/filters/gst/gst-plugin/config.h.in                |  130 
 b/filters/gst/gst-plugin/config.log                 | 1308 
 b/filters/gst/gst-plugin/config.status              | 3836 +-
 b/filters/gst/gst-plugin/config.sub                 | 3316 +-
 b/filters/gst/gst-plugin/configure                  |27730 +++++++++----------
 b/filters/gst/gst-plugin/configure.ac               |  266 
 b/filters/gst/gst-plugin/depcomp                    | 1178 
 b/filters/gst/gst-plugin/gst-autogen.sh             |  616 
 b/filters/gst/gst-plugin/install-sh                 | 1038 
 b/filters/gst/gst-plugin/libtool                    |16728 ++++++------
 b/filters/gst/gst-plugin/ltmain.sh                  |15760 +++++------
 b/filters/gst/gst-plugin/m4/CVS/Entries             |    8 
 b/filters/gst/gst-plugin/m4/Makefile                |  690 
 b/filters/gst/gst-plugin/m4/Makefile.am             |    2 
 b/filters/gst/gst-plugin/m4/Makefile.in             |  690 
 b/filters/gst/gst-plugin/m4/as-compiler-flag.m4     |   50 
 b/filters/gst/gst-plugin/m4/as-version.m4           |  132 
 b/filters/gst/gst-plugin/missing                    |  734 
 b/filters/gst/gst-plugin/src/Makefile               | 1092 
 b/filters/gst/gst-plugin/src/Makefile.am            |   78 
 b/filters/gst/gst-plugin/src/Makefile.in            | 1092 
 b/filters/gst/gst-plugin/src/decif.c                |  392 
 b/filters/gst/gst-plugin/src/decif.h                |  162 
 b/filters/gst/gst-plugin/src/gstbcmdec.c            | 7084 ++---
 b/filters/gst/gst-plugin/src/gstbcmdec.h            |  862 
 b/filters/gst/gst-plugin/src/parse.c                |  670 
 b/filters/gst/gst-plugin/src/parse.h                |  226 
 b/filters/gst/gst-plugin/src/version.h              |  406 
 b/filters/gst/gst-plugin/src/version_lnx.h          |  222 
 b/filters/gst/gst-plugin/stamp-h1                   |    2 
 b/include/7411d.h                                   | 4726 +--
 b/include/bc_dts_defs.h                             | 1002 
 b/include/bc_dts_glob_lnx.h                         |  598 
 b/include/bc_dts_types.h                            |  238 
 b/include/link/bc_defines.h                         |   96 
 b/include/link/bcm_70012_regs.h                     |24598 ++++++++---------
 b/include/vdec_info.h                               |  930 
 b/include/version_lnx.h                             |  158 
 b/linux_lib/libcrystalhd/.gitignore                 |    2 
 b/linux_lib/libcrystalhd/Makefile                   |  117 
 b/linux_lib/libcrystalhd/libcrystalhd_fwcmds.cpp    | 2414 -
 b/linux_lib/libcrystalhd/libcrystalhd_fwcmds.h      |  378 
 b/linux_lib/libcrystalhd/libcrystalhd_fwdiag_if.cpp |  562 
 b/linux_lib/libcrystalhd/libcrystalhd_fwdiag_if.h   |  208 
 b/linux_lib/libcrystalhd/libcrystalhd_if.cpp        | 3520 +-
 b/linux_lib/libcrystalhd/libcrystalhd_if.h          | 2302 -
 b/linux_lib/libcrystalhd/libcrystalhd_int_if.cpp    | 2742 -
 b/linux_lib/libcrystalhd/libcrystalhd_int_if.h      |  534 
 b/linux_lib/libcrystalhd/libcrystalhd_priv.cpp      | 3524 +-
 b/linux_lib/libcrystalhd/libcrystalhd_priv.h        |  693 
 b/linux_lib/libcrystalhd/ln-libcrystalhd.sh         |   24 
 driver/linux/Module.markers                         |   30 
 driver/linux/modules.order                          |    1 
 89 files changed, 119074 insertions(+), 118942 deletions(-)

--- NEW FILE libcrystalhd-updates.patch ---
 .gitignore                                        |   72 +
 driver/linux/.gitignore                           |    6 +
 driver/linux/20-crystalhd.rules                   |    1 +
 driver/linux/Makefile.in                          |   84 +-
 driver/linux/Module.markers                       |   30 -
 driver/linux/bcm_70012_dev.sh                     |  112 +-
 driver/linux/bcm_70012_run.sh                     |   94 +-
 driver/linux/configure.ac                         |   30 +-
 driver/linux/crystalhd_cmds.c                     | 2119 +-
 driver/linux/crystalhd_cmds.h                     |  176 +-
 driver/linux/crystalhd_fw_if.h                    |  740 +-
 driver/linux/crystalhd_hw.c                       | 4789 ++--
 driver/linux/crystalhd_hw.h                       |  796 +-
 driver/linux/crystalhd_lnx.c                      | 1542 +-
 driver/linux/crystalhd_lnx.h                      |  190 +-
 driver/linux/crystalhd_misc.c                     | 2079 +-
 driver/linux/crystalhd_misc.h                     |  457 +-
 driver/linux/modules.order                        |    1 -
 examples/build.sh                                 |    4 +-
 examples/hellobcm.cpp                             |  558 +-
 examples/mpeg2test.cpp                            |  558 +-
 export-driver-for-staging.sh                      |   40 +
 filters/gst/gst-plugin/AUTHORS                    |   34 +-
 filters/gst/gst-plugin/COPYING                    | 1008 +-
 filters/gst/gst-plugin/INSTALL                    |  474 +-
 filters/gst/gst-plugin/Makefile                   | 1310 +-
 filters/gst/gst-plugin/Makefile.am                |    6 +-
 filters/gst/gst-plugin/Makefile.in                | 1310 +-
 filters/gst/gst-plugin/aclocal.m4                 |17966 +++++++-------
 filters/gst/gst-plugin/autogen.sh                 |  182 +-
 filters/gst/gst-plugin/autom4te.cache/output.0    |27738 ++++++++++----------
 filters/gst/gst-plugin/autom4te.cache/output.1    |27730 ++++++++++----------
 filters/gst/gst-plugin/autom4te.cache/requests    |  560 +-
 filters/gst/gst-plugin/autom4te.cache/traces.0    | 4960 ++--
 filters/gst/gst-plugin/autom4te.cache/traces.1    | 1206 +-
 filters/gst/gst-plugin/autoregen.sh               |    4 +-
 filters/gst/gst-plugin/config.guess               | 3052 ++--
 filters/gst/gst-plugin/config.h                   |  132 +-
 filters/gst/gst-plugin/config.h.in                |  130 +-
 filters/gst/gst-plugin/config.log                 | 1308 +-
 filters/gst/gst-plugin/config.status              | 3836 ++--
 filters/gst/gst-plugin/config.sub                 | 3316 ++--
 filters/gst/gst-plugin/configure                  |27730 ++++++++++----------
 filters/gst/gst-plugin/configure.ac               |  266 +-
 filters/gst/gst-plugin/depcomp                    | 1178 +-
 filters/gst/gst-plugin/gst-autogen.sh             |  616 +-
 filters/gst/gst-plugin/install-sh                 | 1038 +-
 filters/gst/gst-plugin/libtool                    |16728 +++++++-------
 filters/gst/gst-plugin/ltmain.sh                  |15760 ++++++------
 filters/gst/gst-plugin/m4/CVS/Entries             |    8 +-
 filters/gst/gst-plugin/m4/Makefile                |  690 +-
 filters/gst/gst-plugin/m4/Makefile.am             |    2 +-
 filters/gst/gst-plugin/m4/Makefile.in             |  690 +-
 filters/gst/gst-plugin/m4/as-compiler-flag.m4     |   50 +-
 filters/gst/gst-plugin/m4/as-version.m4           |  132 +-
 filters/gst/gst-plugin/missing                    |  734 +-
 filters/gst/gst-plugin/src/Makefile               | 1092 +-
 filters/gst/gst-plugin/src/Makefile.am            |   78 +-
 filters/gst/gst-plugin/src/Makefile.in            | 1092 +-
 filters/gst/gst-plugin/src/decif.c                |  392 +-
 filters/gst/gst-plugin/src/decif.h                |  162 +-
 filters/gst/gst-plugin/src/gstbcmdec.c            | 7084 +++---
 filters/gst/gst-plugin/src/gstbcmdec.h            |  862 +-
 filters/gst/gst-plugin/src/parse.c                |  670 +-
 filters/gst/gst-plugin/src/parse.h                |  226 +-
 filters/gst/gst-plugin/src/version.h              |  406 +-
 filters/gst/gst-plugin/src/version_lnx.h          |  222 +-
 filters/gst/gst-plugin/stamp-h1                   |    2 +-
 include/7411d.h                                   | 4726 ++--
 include/bc_dts_defs.h                             | 1002 +-
 include/bc_dts_glob_lnx.h                         |  598 +-
 include/bc_dts_types.h                            |  238 +-
 include/link/bc_defines.h                         |   96 +-
 include/link/bcm_70012_regs.h                     |24598 +++++++++---------
 include/vdec_info.h                               |  930 +-
 include/version_lnx.h                             |  158 +-
 linux_lib/libcrystalhd/.gitignore                 |    2 +
 linux_lib/libcrystalhd/Makefile                   |  117 +-
 linux_lib/libcrystalhd/libcrystalhd_fwcmds.cpp    | 2414 +-
 linux_lib/libcrystalhd/libcrystalhd_fwcmds.h      |  378 +-
 linux_lib/libcrystalhd/libcrystalhd_fwdiag_if.cpp |  562 +-
 linux_lib/libcrystalhd/libcrystalhd_fwdiag_if.h   |  208 +-
 linux_lib/libcrystalhd/libcrystalhd_if.cpp        | 3520 ++--
 linux_lib/libcrystalhd/libcrystalhd_if.h          | 2302 +-
 linux_lib/libcrystalhd/libcrystalhd_int_if.cpp    | 2742 +-
 linux_lib/libcrystalhd/libcrystalhd_int_if.h      |  534 +-
 linux_lib/libcrystalhd/libcrystalhd_priv.cpp      | 3524 ++--
 linux_lib/libcrystalhd/libcrystalhd_priv.h        |  693 +-
 linux_lib/libcrystalhd/ln-libcrystalhd.sh         |   24 +-
 89 files changed, 119074 insertions(+), 118942 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb2190c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,72 @@
+#
+# NOTE! Don't add files that are generated in specific
+# subdirectories here. Add them in the ".gitignore" file
+# in that subdirectory instead.
+#
+# NOTE! Please use 'git ls-files -i --exclude-standard'
+# command after changing this file, to see if there are
+# any tracked files which get ignored after the change.
+#
+# Normal rules
+#
+.*
+*.o
+*.o.*
+*.a
+*.s
+*.ko
+*.so
+*.so.dbg
+*.mod.c
+*.i
+*.lst
+*.symtypes
+*.order
+modules.builtin
+*.elf
+*.bin
+*.gz
+*.bz2
+*.lzma
+*.patch
+*.gcno
+
+#
+# Top-level generic files
+#
+tags
+TAGS
+vmlinux
+System.map
+Module.markers
+Module.symvers
+!.gitignore
+!.mailmap
+
+#
+# Generated include files
+#
+include/config
+include/linux/version.h
+include/generated
+
+# stgit generated dirs
+patches-*
+
+# quilt's files
+patches
+series
+
+# cscope files
+cscope.*
+ncscope.*
+
+# gnu global files
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+
+*.orig
+*~
+\#*#
diff --git a/driver/linux/.gitignore b/driver/linux/.gitignore
new file mode 100644
index 0000000..6d1ab95
--- /dev/null
+++ b/driver/linux/.gitignore
@@ -0,0 +1,6 @@
+# generated files:
+Makefile
+autom4te.cache
+config.log
+config.status
+configure
diff --git a/driver/linux/20-crystalhd.rules b/driver/linux/20-crystalhd.rules
new file mode 100644
index 0000000..93b21b8
--- /dev/null
+++ b/driver/linux/20-crystalhd.rules
@@ -0,0 +1 @@
+KERNEL=="crystalhd", MODE="0666"
diff --git a/driver/linux/Makefile.in b/driver/linux/Makefile.in
index cc4c1ba..b8f731d 100644
--- a/driver/linux/Makefile.in
+++ b/driver/linux/Makefile.in
@@ -1,41 +1,43 @@
-#
-#  Broadcom Crystal HD (BCM970012) controller Makefile.
-#
-#
-CRYSTALHD_ROOT = @CRYSTALHDROOT@
-KDIR = @KERN_DIR@
[...238160 lines suppressed...]
+
+typedef struct _DTS_LIB_CONTEXT{
+	uint32_t				Sig;			/* Mazic number */
+	uint32_t				State;			/* DIL's Run State */
+	int				DevHandle;		/* Driver handle */
+	BC_IOCTL_DATA	*pIoDataFreeHd;	/* IOCTL data pool head */
+	DTS_MPOOL_TYPE	*Mpools;		/* List of memory pools created */
+	uint32_t				MpoolCnt;		/* Number of entries */
+	uint32_t				CfgFlags;		/* Application specifi flags */
+	uint32_t				OpMode;			/* Mode of operation playback etc..*/
+	uint32_t				DevId;			/* HW Device ID */
+	uint32_t				hwRevId;		/* HW revision ID */
+	uint32_t				fwcmdseq;		/* FW Cmd Sequence number */
+	uint32_t				FixFlags;		/* Flags for conditionally enabling fixes */
+
+	pthread_mutex_t  thLock;
+
+
+
+	DTS_VIDEO_PARAMS VidParams;		/* App specific Video Params */
+
+	DecRspChannelStreamOpen OpenRsp;/* Channel Open Response */
+	DecRspChannelStartVideo	sVidRsp;/* Start Video Response */
+
+	/* Proc Output Related */
+	BOOL			ProcOutPending;	/* To avoid muliple ProcOuts */
+	BOOL			CancelWaiting;	/* Notify FetchOut to signal */
+	sem_t			CancelProcOut;	/* Cancel outstanding ProcOut Request */
+
+	/* pOutData is dedicated for ProcOut() use only. Every other
+	 * Interface should use the memory from IocData pool. This
+	 * is to provide priority for ProcOut() interface due to its
+	 * performance criticality.
+	 *
+	 * !!!!!NOTE!!!!
+	 *
+	 * Using this data structures for other interfaces, will cause
+	 * thread related race conditions.
+	 */
+	BC_IOCTL_DATA	*pOutData;		/* Current Active Proc Out Buffer */
+
+	/* Place Holder for FW file paths */
+	char				StreamFile[MAX_PATH+1];
+	char				VidInner[MAX_PATH+1];
+	char				VidOuter[MAX_PATH+1];
+
+	uint32_t				InMdataTag;				/* InMetaData Tag for TimeStamp */
+	void			*MdataPoolPtr;			/* allocated memory PoolPointer */
+
+	struct _DTS_INPUT_MDATA	*MDFreeHead;	/* MetaData Free List Head */
+
+	struct _DTS_INPUT_MDATA	*MDPendHead;	/* MetaData Pending List Head */
+	struct _DTS_INPUT_MDATA	*MDPendTail;	/* MetaData Pending List Tail */
+	uint32_t			MDPendCount;
+
+	/* End Of Stream detection */
+	BOOL			FlushIssued;			/* Flag to start EOS detection */
+	uint32_t				eosCnt;					/* Last picture repetition count */
+	uint32_t				LastPicNum;				/* Last picture number */
+
+	/* Statistics Related */
+	uint32_t				prevPicNum;				/* Previous received frame */
+	uint32_t				CapState;				/* 0 = Not started, 1 = Interlaced, 2 = progressive */
+	uint32_t				PibIntToggle;			/* Toggle flag to detect PIB miss in Interlaced mode.*/
+	uint32_t				prevFrameRate;			/* Previous frame rate */
+
+	BC_REG_CONFIG	RegCfg;					/* Registry Configurable options.*/
+
+	char				FwBinFile[MAX_PATH+1];	/* Firmware Bin file place holder */
+
+	uint8_t				b422Mode;				/* 422 Mode Identifier for Link */
+	uint32_t				picWidth;
+	uint32_t				picHeight;
+
+	char				DilPath[MAX_PATH+1];	/* DIL runtime Location.. */
+
+	/* Power management and dynamic clock frequency changes related */
+	uint8_t				totalPicsCounted;
+	uint8_t				rptPicsCounted;
+	uint8_t				nrptPicsCounted;
+	uint8_t				numTimesClockChanged;
+	uint8_t				minClk;
+	uint8_t				maxClk;
+	uint8_t				curClk;
+
+}DTS_LIB_CONTEXT;
+
+/* Helper macro to get lib context from user handle */
+#define DTS_GET_CTX(_uh, _c)											\
+{																		\
+	if( !(_c = DtsGetContext(_uh)) ){									\
+		return BC_STS_INV_ARG;											\
+	}																	\
+}
+
+
+extern DTS_LIB_CONTEXT	*	DtsGetContext(HANDLE userHnd);
+BOOL DtsIsPend(DTS_LIB_CONTEXT	*Ctx);
+BOOL DtsDrvIoctl
+(
+	  HANDLE	hDevice,
+	  DWORD		dwIoControlCode,
+	  LPVOID	lpInBuffer,
+	  DWORD		nInBufferSize,
+	  LPVOID	lpOutBuffer,
+	  DWORD		nOutBufferSize,
+	  LPDWORD	lpBytesReturned,
+	  BOOL		Async
+);
+BC_STATUS DtsDrvCmd(DTS_LIB_CONTEXT	*Ctx, DWORD Code, BOOL Async, BC_IOCTL_DATA *pIoData, BOOL Rel);
+void DtsRelIoctlData(DTS_LIB_CONTEXT *Ctx, BC_IOCTL_DATA *pIoData);
+BC_IOCTL_DATA *DtsAllocIoctlData(DTS_LIB_CONTEXT *Ctx);
+BC_STATUS DtsAllocMemPools(DTS_LIB_CONTEXT *Ctx);
+void DtsReleaseMemPools(DTS_LIB_CONTEXT *Ctx);
+BC_STATUS DtsAddOutBuff(DTS_LIB_CONTEXT *Ctx, PVOID buff, uint32_t flags);
+BC_STATUS DtsRelRxBuff(DTS_LIB_CONTEXT *Ctx, BC_DEC_YUV_BUFFS *buff,BOOL SkipAddBuff);
+BC_STATUS DtsFetchOutInterruptible(DTS_LIB_CONTEXT *Ctx, BC_DTS_PROC_OUT *DecOut, uint32_t dwTimeout);
+BC_STATUS DtsCancelFetchOutInt(DTS_LIB_CONTEXT *Ctx);
+BC_STATUS DtsMapYUVBuffs(DTS_LIB_CONTEXT *Ctx);
+BC_STATUS DtsInitInterface(int hDevice,HANDLE *RetCtx, uint32_t mode);
+BC_STATUS DtsSetupConfig(DTS_LIB_CONTEXT *Ctx, uint32_t did, uint32_t rid, uint32_t FixFlags);
+BC_STATUS DtsReleaseInterface(DTS_LIB_CONTEXT *Ctx);
+BC_STATUS DtsGetBCRegConfig(DTS_LIB_CONTEXT	*Ctx);
+BC_STATUS DtsGetFirmwareFiles(DTS_LIB_CONTEXT	*Ctx);
+DTS_INPUT_MDATA	*DtsAllocMdata(DTS_LIB_CONTEXT *Ctx);
+BC_STATUS DtsFreeMdata(DTS_LIB_CONTEXT *Ctx, DTS_INPUT_MDATA	*Mdata, BOOL sync);
+BC_STATUS DtsClrPendMdataList(DTS_LIB_CONTEXT *Ctx);
+BC_STATUS DtsInsertMdata(DTS_LIB_CONTEXT *Ctx, DTS_INPUT_MDATA	*Mdata);
+BC_STATUS DtsRemoveMdata(DTS_LIB_CONTEXT *Ctx, DTS_INPUT_MDATA	*Mdata, BOOL sync);
+BC_STATUS DtsFetchMdata(DTS_LIB_CONTEXT *Ctx, uint16_t snum, BC_DTS_PROC_OUT *pout);
+BC_STATUS DtsPrepareMdata(DTS_LIB_CONTEXT *Ctx, uint64_t timeStamp, DTS_INPUT_MDATA **mData);
+BC_STATUS DtsPrepareMdataASFHdr(DTS_LIB_CONTEXT *Ctx, DTS_INPUT_MDATA *mData, uint8_t* buf);
+BC_STATUS DtsNotifyOperatingMode(HANDLE hDevice,uint32_t Mode);
+/*====================== Performance Counter Routines ============================*/
+void DtsUpdateInStats(DTS_LIB_CONTEXT	*Ctx, uint32_t	size);
+void DtsUpdateOutStats(DTS_LIB_CONTEXT	*Ctx, BC_DTS_PROC_OUT *pOut);
+
+/*====================== Debug Routines ========================================*/
+void DtsTestMdata(DTS_LIB_CONTEXT	*gCtx);
+BOOL DtsDbgCheckPointers(DTS_LIB_CONTEXT *Ctx,BC_IOCTL_DATA *pIo);
+
+/*============== Global shared area usage ======================*/
+
+#define BC_DIL_HWINIT_IN_PROGRESS 1
+#ifdef _USE_SHMEM_
+#define BC_DIL_SHMEM_KEY 0xBABEFACE
+
+typedef struct _bc_dil_glob_s{
+	uint32_t gDilOpMode;
+	uint32_t gHwInitSts;
+	BC_DTS_STATS stats;
+} bc_dil_glob_s;
+
+
+BC_STATUS DtsGetDilShMem(uint32_t shmid);
+BC_STATUS DtsDelDilShMem(void);
+BC_STATUS DtsCreateShMem(int *shmem_id);
+#endif
+uint32_t DtsGetOPMode( void );
+void DtsSetOPMode( uint32_t value );
+uint32_t DtsGetHwInitSts( void );
+void DtsSetHwInitSts( uint32_t value );
+void DtsRstStats( void ) ;
+BC_DTS_STATS * DtsGetgStats ( void );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/linux_lib/libcrystalhd/ln-libcrystalhd.sh b/linux_lib/libcrystalhd/ln-libcrystalhd.sh
index 0b4e613..2186233 100644
--- a/linux_lib/libcrystalhd/ln-libcrystalhd.sh
+++ b/linux_lib/libcrystalhd/ln-libcrystalhd.sh
@@ -1,12 +1,12 @@
-#!/bin/bash
-#
-# Author: Prasad Bolisetty
-#
-# Script to create symlink for crystalhd soname.
-# 
-# TBD:: Add install option. For now ==> ${PWD} 
-# 
-
-ln -sf libcrystalhd.so.1.0 libcrystalhd.so
-ln -sf libcrystalhd.so.1.0 libcrystalhd.so.1
-
+#!/bin/bash
+#
+# Author: Prasad Bolisetty
+#
+# Script to create symlink for crystalhd soname.
+# 
+# TBD:: Add install option. For now ==> ${PWD} 
+# 
+
+ln -sf libcrystalhd.so.1.0 libcrystalhd.so
+ln -sf libcrystalhd.so.1.0 libcrystalhd.so.1
+


--- NEW FILE libcrystalhd.spec ---
# Nb: this is temporary. Broadcom is working on getting the firmware released
# under a redistributable, no-modification license.
%define with_firmware %{?_with_firmware: 1} %{?!_with_firmware: 0}

Summary:        Broadcom Crystal HD device interface library
Name:           libcrystalhd
Version:        0.9.25
Release:        2%{?dist}
License:        LGPLv2
Group:          System Environment/Libraries
%if %{with_firmware}
Source:         http://www.broadcom.com/docs/support/crystalhd/crystalhd_linux_20091229.zip
Requires:       crystalhd-firmware
%else
# The source archive contains a firmware image that doesn't yet have an
# acceptable license for redistribution, so we unpack, strip it, and repack the archive.
Source:         %{name}-%{version}.tar.bz2
%endif
URL:            http://www.broadcom.com/support/crystal_hd/
Patch:          libcrystalhd-updates.patch
ExcludeArch:    s390 s390x
BuildRequires:  autoconf automake

%description
The libcrystalhd library provides userspace access to Broadcom Crystal HD
video decoder devices. The device supports hardware decoding of MPEG-2,
h.264 and VC1 video codecs, up to 1080p at 40fps.

%package devel
Summary:       Development libs for libcrystalhd
Group:         Development/Libraries
Requires:      %{name} = %{version}-%{release}

%description devel
Development libraries needed to build applications against libcrystalhd.

%if %{with_firmware}
%package -n crystalhd-firmware
Summary:       Firmware for the Broadcom Crystal HD video decoder
License:       Redistributable, no modification permitted
BuildArch:     noarch
Group:         System Environment/Kernel
Requires:      %{name} = %{version}-%{release}

%description -n crystalhd-firmware
Firmware for the Broadcom Crystal HD (bcm970012) video decoder.
%endif

%prep
%if %{with_firmware}
%setup -q -n crystalhd
%else
%setup -q
%endif
%patch -p1

%build
%if !%{with_firmware}
sed -i -e 's|cp $(ROOTDIR)/firmware/fwbin/70012/bcm70012fw.bin $(DESTDIR)/lib/firmware/|#cp $(ROOTDIR)/firmware/fwbin/70012/bcm70012fw.bin $(DESTDIR)/lib/firmware/|g' linux_lib/libcrystalhd/Makefile
%endif
pushd linux_lib/libcrystalhd/ > /dev/null 2>&1
# FIXME: this doesn't work just yet...
#make CPPFLAGS="%{optflags}" %{?_smp_mflags}
make %{?_smp_mflags}
popd > /dev/null 2>&1

%install
rm -rf $RPM_BUILD_ROOT
pushd linux_lib/libcrystalhd/ > /dev/null 2>&1
make install LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT
popd > /dev/null 2>&1

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,0755)
%{_libdir}/libcrystalhd.so.*

%files devel
%defattr(-,root,root,0755)
%dir %{_includedir}/libcrystalhd
%{_includedir}/libcrystalhd/*
%{_libdir}/libcrystalhd.so

%if %{with_firmware}
%files -n crystalhd-firmware
%defattr(-,root,root,0755)
/lib/firmware/bcm70012fw.bin
%endif


%changelog
* Thu Mar 11 2010 Jarod Wilson <jarod at redhat.com> - 0.9.25-2
- Minor fixups to the as-yet-not-enabled firmware sub-package

* Wed Jan 06 2010 Jarod Wilson <jarod at redhat.com> - 0.9.25-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcrystalhd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	10 Mar 2010 22:42:03 -0000	1.1
+++ .cvsignore	11 Mar 2010 15:16:26 -0000	1.2
@@ -0,0 +1 @@
+libcrystalhd-0.9.25.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcrystalhd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	10 Mar 2010 22:42:03 -0000	1.1
+++ sources	11 Mar 2010 15:16:29 -0000	1.2
@@ -0,0 +1 @@
+89e6d2210ffe9a31a9f58af2dd6f6e1f  libcrystalhd-0.9.25.tar.bz2



More information about the scm-commits mailing list