mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
update ltq-tapidemo to 5.1.0.53
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27533 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,78 +1,61 @@
|
||||
--- a/src/board_easy50712.c Mon Mar 15 14:47:53 2010 +0300
|
||||
+++ b/src/board_easy50712.c Tue Mar 16 17:25:55 2010 +0300
|
||||
@@ -40,7 +40,9 @@
|
||||
#endif /* DUSLIC_FXO */
|
||||
#endif /* EASY50712_V3 */
|
||||
|
||||
-#include "asm/ifx/ifx_gpio.h"
|
||||
--- a/src/board_easy50712.c
|
||||
+++ b/src/board_easy50712.c
|
||||
@@ -32,7 +32,9 @@
|
||||
#ifdef OLD_BSP
|
||||
#include "asm/danube/port.h"
|
||||
#else
|
||||
- #include "asm/ifx/ifx_gpio.h"
|
||||
+#ifdef FXO
|
||||
+# include "asm/ifx/ifx_gpio.h"
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
/* ============================= */
|
||||
/* Defines */
|
||||
@@ -896,6 +898,7 @@
|
||||
/* Global function definition */
|
||||
/* ============================= */
|
||||
|
||||
+#ifdef FXO
|
||||
/**
|
||||
Set direction of GPIO pin to out which is used for set/clear reset.
|
||||
|
||||
@@ -944,7 +947,7 @@
|
||||
return IFX_SUCCESS;
|
||||
}
|
||||
break;
|
||||
-
|
||||
+
|
||||
case GPIO_DUSLIC_EASY50510:
|
||||
{
|
||||
TRACE(TAPIDEMO, DBG_LEVEL_LOW,
|
||||
@@ -982,8 +985,9 @@
|
||||
|
||||
return IFX_SUCCESS;
|
||||
};
|
||||
+#endif
|
||||
--- a/src/board_easy508xx.c
|
||||
+++ b/src/board_easy508xx.c
|
||||
@@ -32,8 +32,6 @@
|
||||
#endif /* FXO */
|
||||
#include "pcm.h"
|
||||
|
||||
-#include "asm/ifx/ifx_gpio.h"
|
||||
-
|
||||
+#ifdef FXO
|
||||
/*
|
||||
Set/Clear reset of device by using GPIO port.
|
||||
|
||||
@@ -1086,7 +1090,9 @@
|
||||
/* usleep(100000); karol - workaround, */
|
||||
return ret;
|
||||
}
|
||||
+#endif
|
||||
|
||||
+#ifdef EASY50510
|
||||
/**
|
||||
Set PCM master mode.
|
||||
|
||||
@@ -1178,15 +1184,16 @@
|
||||
|
||||
return ret;
|
||||
}
|
||||
+#endif
|
||||
|
||||
/**
|
||||
Register board.
|
||||
|
||||
\param pBoard - pointer to board
|
||||
-
|
||||
+
|
||||
\return IFX_SUCCESS if successful, otherwise IFX_ERROR.
|
||||
|
||||
- \remarks
|
||||
+ \remarks
|
||||
*/
|
||||
IFX_return_t BOARD_Easy50712_Register(BOARD_t* pBoard)
|
||||
#ifdef TD_DECT
|
||||
#include "td_dect.h"
|
||||
#endif /* TD_DECT */
|
||||
--- a/src/common.c
|
||||
+++ b/src/common.c
|
||||
@@ -7117,7 +7117,7 @@ IFX_return_t Common_GPIO_ClosePort(IFX_c
|
||||
IFX_return_t Common_GPIO_ReservePin(IFX_int32_t nFd, IFX_int32_t nPort,
|
||||
IFX_int32_t nPin, IFX_int32_t nModule)
|
||||
{
|
||||
@@ -1204,7 +1211,3 @@
|
||||
pBoard->RemoveBoard = BOARD_Easy50712_RemoveBoard;
|
||||
return IFX_SUCCESS;
|
||||
}
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-#ifndef OLD_BSP
|
||||
+#if !defined(OLD_BSP) && defined(IFX_GPIO_IOC_PIN_RESERVE)
|
||||
TD_PARAMETER_CHECK((NO_GPIO_FD >= nFd), nFd, IFX_ERROR);
|
||||
|
||||
IFX_return_t nRet;
|
||||
@@ -7155,7 +7155,7 @@ IFX_return_t Common_GPIO_ReservePin(IFX_
|
||||
IFX_return_t Common_GPIO_FreePin(IFX_int32_t nFd, IFX_int32_t nPort,
|
||||
IFX_int32_t nPin, IFX_int32_t nModule)
|
||||
{
|
||||
-#ifndef OLD_BSP
|
||||
+#if !defined(OLD_BSP) && defined(IFX_GPIO_IOC_PIN_RESERVE)
|
||||
TD_PARAMETER_CHECK((NO_GPIO_FD >= nFd), nFd, IFX_ERROR);
|
||||
|
||||
IFX_return_t nRet;
|
||||
--- a/src/common.h
|
||||
+++ b/src/common.h
|
||||
@@ -79,12 +79,12 @@
|
||||
#ifdef OLD_BSP
|
||||
#include "asm/danube/port.h"
|
||||
#else
|
||||
- #include "asm/ifx/ifx_gpio.h"
|
||||
+ /*#include "asm/ifx/ifx_gpio.h"*/
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if (defined(AR9) || defined(VR9))
|
||||
- #include "asm/ifx/ifx_gpio.h"
|
||||
+ /*#include "asm/ifx/ifx_gpio.h"*/
|
||||
#endif
|
||||
|
||||
#ifdef TD_DECT
|
||||
|
||||
Reference in New Issue
Block a user