Commit 6c1d56c5 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] drx-j: get rid of the bsp*.h headers 



Move them into drx_driver.h

That makes easier to cleanup further what's there at the
headers.

Acked-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 73f7065b

drivers/media/dvb-frontends/drx39xyj/bsp_host.h

deleted100644 → 0
+0 −78
Original line number Diff line number Diff line 
/*

  Copyright (c), 2004-2005,2007-2010 Trident Microsystems, Inc.

  All rights reserved.



  Redistribution and use in source and binary forms, with or without

  modification, are permitted provided that the following conditions are met:



  * Redistributions of source code must retain the above copyright notice,

    this list of conditions and the following disclaimer.

  * Redistributions in binary form must reproduce the above copyright notice,

    this list of conditions and the following disclaimer in the documentation

	and/or other materials provided with the distribution.

  * Neither the name of Trident Microsystems nor Hauppauge Computer Works

    nor the names of its contributors may be used to endorse or promote

	products derived from this software without specific prior written

	permission.



  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

  POSSIBILITY OF SUCH DAMAGE.

*/



/**

* \file $Id: bsp_host.h,v 1.3 2009/07/07 14:20:30 justin Exp $

*

* \brief Host and OS dependent type definitions, macro's and functions

*

*/



#ifndef __DRXBSP_HOST_H__

#define __DRXBSP_HOST_H__

/*-------------------------------------------------------------------------

INCLUDES

-------------------------------------------------------------------------*/

#include "bsp_types.h"



#ifdef __cplusplus

extern "C" {

#endif



/*-------------------------------------------------------------------------

TYPEDEFS

-------------------------------------------------------------------------*/



/*-------------------------------------------------------------------------

DEFINES

-------------------------------------------------------------------------*/



/*-------------------------------------------------------------------------

Exported FUNCTIONS

-------------------------------------------------------------------------*/

	DRXStatus_t DRXBSP_HST_Init(void);



	DRXStatus_t DRXBSP_HST_Term(void);



	void *DRXBSP_HST_Memcpy(void *to, void *from, u32 n);



	int DRXBSP_HST_Memcmp(void *s1, void *s2, u32 n);



	u32 DRXBSP_HST_Clock(void);



	DRXStatus_t DRXBSP_HST_Sleep(u32 n);



/*-------------------------------------------------------------------------

THE END

-------------------------------------------------------------------------*/

#ifdef __cplusplus

}

#endif

#endif				/* __DRXBSP_HOST_H__ */

drivers/media/dvb-frontends/drx39xyj/bsp_types.h

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/*

  Copyright (c), 2004-2005,2007-2010 Trident Microsystems, Inc.

  All rights reserved.



  Redistribution and use in source and binary forms, with or without

  modification, are permitted provided that the following conditions are met:



  * Redistributions of source code must retain the above copyright notice,

    this list of conditions and the following disclaimer.

  * Redistributions in binary form must reproduce the above copyright notice,

    this list of conditions and the following disclaimer in the documentation

	and/or other materials provided with the distribution.

  * Neither the name of Trident Microsystems nor Hauppauge Computer Works

    nor the names of its contributors may be used to endorse or promote

	products derived from this software without specific prior written

	permission.



  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

  POSSIBILITY OF SUCH DAMAGE.

*/



#include <linux/kernel.h>



#ifndef __BSP_TYPES_H__

#define __BSP_TYPES_H__



/*-------------------------------------------------------------------------

ENUM

-------------------------------------------------------------------------*/



/**

* \enum DRXStatus_t

* \brief Various return statusses

*/

	typedef enum {

		DRX_STS_READY = 3,  /**< device/service is ready     */

		DRX_STS_BUSY = 2,   /**< device/service is busy      */

		DRX_STS_OK = 1,	    /**< everything is OK            */

		DRX_STS_INVALID_ARG = -1,

				    /**< invalid arguments           */

		DRX_STS_ERROR = -2, /**< general error               */

		DRX_STS_FUNC_NOT_AVAILABLE = -3

				    /**< unavailable functionality   */

	} DRXStatus_t, *pDRXStatus_t;



#endif				/* __BSP_TYPES_H__ */

drivers/media/dvb-frontends/drx39xyj/drx39xxj.c

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#include "dvb_frontend.h"

#include "drx39xxj.h"

#include "drx_driver.h"

#include "bsp_types.h"

#include "bsp_tuner.h"

#include "drxj_mc.h"

#include "drxj.h"

drivers/media/dvb-frontends/drx39xyj/drx39xxj_dummy.c

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#include <linux/types.h>



#include "drx_driver.h"

#include "bsp_types.h"

#include "bsp_tuner.h"

#include "drx39xxj.h"



/* Dummy function to satisfy drxj.c */

drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
*******************************************************************************/



#include "drx_dap_fasi.h"

#include "bsp_host.h"		/* for DRXBSP_HST_Memcpy() */

#include "drx_driver.h"		/* for DRXBSP_HST_Memcpy() */



/*============================================================================*/