mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-14 19:04:39 +00:00
ifxmips-dsl-api: fix portability errors
SVN-Revision: 20554
This commit is contained in:
Felix Fietkau
parent
3dd6909c20
commit
db567ffd3d
@ -117,6 +117,11 @@ define Build/Prepare
|
|||||||
$(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(FW_BASE_NAME)_b-$(FW_B_VER).tar.gz
|
$(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(FW_BASE_NAME)_b-$(FW_B_VER).tar.gz
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
define Build/Configure
|
||||||
|
(cd $(PKG_BUILD_DIR); aclocal && autoconf && automake)
|
||||||
|
$(call Build/Configure/Default)
|
||||||
|
endef
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
cd $(LINUX_DIR); \
|
cd $(LINUX_DIR); \
|
||||||
ARCH=mips CROSS_COMPILE="$(KERNEL_CROSS)" \
|
ARCH=mips CROSS_COMPILE="$(KERNEL_CROSS)" \
|
||||||
|
|||||||
184
package/ifxmips-dsl-api/patches/500-portability.patch
Normal file
184
package/ifxmips-dsl-api/patches/500-portability.patch
Normal file
@ -0,0 +1,184 @@
|
|||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
|
@@ -333,12 +333,12 @@ AC_ARG_ENABLE(ifxos-include,
|
||||||
|
echo Set the lib_ifxos include path $enableval
|
||||||
|
AC_SUBST([IFXOS_INCLUDE_PATH],[$enableval])
|
||||||
|
else
|
||||||
|
- echo -e Set the default lib_ifxos include path $DEFAULT_IFXOS_INCLUDE_PATH
|
||||||
|
+ echo Set the default lib_ifxos include path $DEFAULT_IFXOS_INCLUDE_PATH
|
||||||
|
AC_SUBST([IFXOS_INCLUDE_PATH],[$DEFAULT_IFXOS_INCLUDE_PATH])
|
||||||
|
fi
|
||||||
|
],
|
||||||
|
[
|
||||||
|
- echo -e Set the default lib_ifxos include path $DEFAULT_IFXOS_INCLUDE_PATH
|
||||||
|
+ echo Set the default lib_ifxos include path $DEFAULT_IFXOS_INCLUDE_PATH
|
||||||
|
AC_SUBST([IFXOS_INCLUDE_PATH],[$DEFAULT_IFXOS_INCLUDE_PATH])
|
||||||
|
]
|
||||||
|
)
|
||||||
|
@@ -1702,73 +1702,73 @@ dnl Set the configure params for dist ch
|
||||||
|
AC_SUBST([DISTCHECK_CONFIGURE_PARAMS],[$CONFIGURE_OPTIONS])
|
||||||
|
|
||||||
|
AC_CONFIG_COMMANDS_PRE([
|
||||||
|
-echo -e "------------------------------------------------------------------------"
|
||||||
|
-echo -e " Configuration for drv_dsl_cpe_api:"
|
||||||
|
-echo -e " Configure model type: $DSL_CONFIG_MODEL_TYPE"
|
||||||
|
-echo -e " Source code location: $srcdir"
|
||||||
|
-echo -e " Compiler: $CC"
|
||||||
|
-echo -e " Compiler c-flags: $CFLAGS"
|
||||||
|
-echo -e " Extra compiler c-flags: $EXTRA_DRV_CFLAGS"
|
||||||
|
-echo -e " Host System Type: $host"
|
||||||
|
-echo -e " Install path: $prefix"
|
||||||
|
-echo -e " Linux kernel include path: $KERNEL_INCL_PATH"
|
||||||
|
-echo -e " Linux kernel build path: $KERNEL_BUILD_PATH"
|
||||||
|
-echo -e " Linux kernel architecture: $KERNEL_ARCH"
|
||||||
|
-echo -e " Include IFXOS: $INCLUDE_DSL_CPE_API_IFXOS_SUPPORT"
|
||||||
|
-echo -e " IFXOS include path: $IFXOS_INCLUDE_PATH"
|
||||||
|
-echo -e " Driver Include Path $DSL_DRIVER_INCL_PATH"
|
||||||
|
-echo -e " DSL device: $DSL_DEVICE_NAME"
|
||||||
|
-echo -e " Max device number: $DSL_DRV_MAX_DEVICE_NUMBER"
|
||||||
|
-echo -e " Channels per line: $DSL_CHANNELS_PER_LINE"
|
||||||
|
-echo -e " Build lib (only for kernel 2.6) $DSL_CPE_API_LIBRARY_BUILD_2_6"
|
||||||
|
-echo -e " DSL data led flash frequency: $DSL_DATA_LED_FLASH_FREQUENCY Hz"
|
||||||
|
-echo -e " Disable debug prints: $DSL_DEBUG_DISABLE"
|
||||||
|
-echo -e " Preselection of max. debug level: $DSL_DBG_MAX_LEVEL_SET"
|
||||||
|
-echo -e " Preselected max. debug level: $DSL_DBG_MAX_LEVEL_PRE"
|
||||||
|
-echo -e " Include deprecated functions: $INCLUDE_DEPRECATED"
|
||||||
|
-echo -e " Include Device Exception Codes: $INCLUDE_DEVICE_EXCEPTION_CODES"
|
||||||
|
-echo -e " Include FW request support: $INCLUDE_FW_REQUEST_SUPPORT"
|
||||||
|
-echo -e " Include ADSL trace buffer: $INCLUDE_DSL_CPE_TRACE_BUFFER"
|
||||||
|
-echo -e " Include ADSL MIB: $INCLUDE_DSL_ADSL_MIB"
|
||||||
|
-echo -e " Include ADSL LED: $INCLUDE_ADSL_LED"
|
||||||
|
-echo -e " Include CEOC: $INCLUDE_DSL_CEOC"
|
||||||
|
-echo -e " Include config get support: $INCLUDE_DSL_CONFIG_GET"
|
||||||
|
-echo -e " Include System i/f configuration: $INCLUDE_DSL_SYSTEM_INTERFACE"
|
||||||
|
-echo -e " Include Resource Statistics: $INCLUDE_DSL_RESOURCE_STATISTICS"
|
||||||
|
-echo -e " Include Framing Parameters: $INCLUDE_DSL_FRAMING_PARAMETERS"
|
||||||
|
-echo -e " Include G997 Line Inventory: $INCLUDE_DSL_G997_LINE_INVENTORY"
|
||||||
|
-echo -e " Include G997 Framing Parameters: $INCLUDE_DSL_G997_FRAMING_PARAMETERS"
|
||||||
|
-echo -e " Include G997 per tone data: $INCLUDE_DSL_G997_PER_TONE"
|
||||||
|
-echo -e " Include G997 status: $INCLUDE_DSL_G997_STATUS"
|
||||||
|
-echo -e " Include G997 alarm: $INCLUDE_DSL_G997_ALARM"
|
||||||
|
-echo -e " Include DSL Bonding: $INCLUDE_DSL_BONDING"
|
||||||
|
-echo -e " Include Misc Line Status $INCLUDE_DSL_CPE_MISC_LINE_STATUS"
|
||||||
|
-echo -e " Include DELT: $INCLUDE_DSL_DELT"
|
||||||
|
-echo -e " Include DELT data static storage: $DSL_CPE_STATIC_DELT_DATA"
|
||||||
|
-echo -e " Include PM: $INCLUDE_DSL_PM"
|
||||||
|
-echo -e " Include PM config: $INCLUDE_DSL_CPE_PM_CONFIG"
|
||||||
|
-echo -e " Include PM total: $INCLUDE_DSL_CPE_PM_TOTAL_COUNTERS"
|
||||||
|
-echo -e " Include PM history: $INCLUDE_DSL_CPE_PM_HISTORY"
|
||||||
|
-echo -e " Include PM showtime: $INCLUDE_DSL_CPE_PM_SHOWTIME_COUNTERS"
|
||||||
|
-echo -e " Include PM optional: $INCLUDE_DSL_CPE_PM_OPTIONAL_PARAMETERS"
|
||||||
|
-echo -e " Include PM line: $INCLUDE_DSL_CPE_PM_LINE_COUNTERS"
|
||||||
|
-echo -e " Include PM line event showtime: $INCLUDE_DSL_CPE_PM_LINE_EVENT_SHOWTIME_COUNTERS"
|
||||||
|
-echo -e " Include PM channel: $INCLUDE_DSL_CPE_PM_CHANNEL_COUNTERS"
|
||||||
|
-echo -e " Include PM channel extended: $INCLUDE_DSL_CPE_PM_CHANNEL_EXT_COUNTERS"
|
||||||
|
-echo -e " Include PM data path: $INCLUDE_DSL_CPE_PM_DATA_PATH_COUNTERS"
|
||||||
|
-echo -e " Include PM data path failure: $INCLUDE_DSL_CPE_PM_DATA_PATH_FAILURE_COUNTERS"
|
||||||
|
-echo -e " Include PM ReTx: $INCLUDE_DSL_CPE_PM_RETX_COUNTERS"
|
||||||
|
-echo -e " Include PM line threshold: $INCLUDE_DSL_CPE_PM_LINE_THRESHOLDS"
|
||||||
|
-echo -e " Include PM channel threshold: $INCLUDE_DSL_CPE_PM_CHANNEL_THRESHOLDS"
|
||||||
|
-echo -e " Include PM data path threshold: $INCLUDE_DSL_CPE_PM_DATA_PATH_THRESHOLDS"
|
||||||
|
-echo -e " Include PM ReTx threshold: $INCLUDE_DSL_CPE_PM_RETX_THRESHOLDS"
|
||||||
|
-echo -e " Include FW memory free support: $INCLUDE_DSL_FIRMWARE_MEMORY_FREE"
|
||||||
|
-echo -e "----------------------- deprectated ! ----------------------------------"
|
||||||
|
-echo -e " Include PM line failure: $INCLUDE_DSL_CPE_PM_LINE_FAILURE_COUNTERS"
|
||||||
|
-echo -e ""
|
||||||
|
-echo -e " Settings:"
|
||||||
|
-echo -e " Configure options: $CONFIGURE_OPTIONS"
|
||||||
|
-echo -e "------------------------------------------------------------------------"
|
||||||
|
+echo "------------------------------------------------------------------------"
|
||||||
|
+echo " Configuration for drv_dsl_cpe_api:"
|
||||||
|
+echo " Configure model type: $DSL_CONFIG_MODEL_TYPE"
|
||||||
|
+echo " Source code location: $srcdir"
|
||||||
|
+echo " Compiler: $CC"
|
||||||
|
+echo " Compiler c-flags: $CFLAGS"
|
||||||
|
+echo " Extra compiler c-flags: $EXTRA_DRV_CFLAGS"
|
||||||
|
+echo " Host System Type: $host"
|
||||||
|
+echo " Install path: $prefix"
|
||||||
|
+echo " Linux kernel include path: $KERNEL_INCL_PATH"
|
||||||
|
+echo " Linux kernel build path: $KERNEL_BUILD_PATH"
|
||||||
|
+echo " Linux kernel architecture: $KERNEL_ARCH"
|
||||||
|
+echo " Include IFXOS: $INCLUDE_DSL_CPE_API_IFXOS_SUPPORT"
|
||||||
|
+echo " IFXOS include path: $IFXOS_INCLUDE_PATH"
|
||||||
|
+echo " Driver Include Path $DSL_DRIVER_INCL_PATH"
|
||||||
|
+echo " DSL device: $DSL_DEVICE_NAME"
|
||||||
|
+echo " Max device number: $DSL_DRV_MAX_DEVICE_NUMBER"
|
||||||
|
+echo " Channels per line: $DSL_CHANNELS_PER_LINE"
|
||||||
|
+echo " Build lib (only for kernel 2.6) $DSL_CPE_API_LIBRARY_BUILD_2_6"
|
||||||
|
+echo " DSL data led flash frequency: $DSL_DATA_LED_FLASH_FREQUENCY Hz"
|
||||||
|
+echo " Disable debug prints: $DSL_DEBUG_DISABLE"
|
||||||
|
+echo " Preselection of max. debug level: $DSL_DBG_MAX_LEVEL_SET"
|
||||||
|
+echo " Preselected max. debug level: $DSL_DBG_MAX_LEVEL_PRE"
|
||||||
|
+echo " Include deprecated functions: $INCLUDE_DEPRECATED"
|
||||||
|
+echo " Include Device Exception Codes: $INCLUDE_DEVICE_EXCEPTION_CODES"
|
||||||
|
+echo " Include FW request support: $INCLUDE_FW_REQUEST_SUPPORT"
|
||||||
|
+echo " Include ADSL trace buffer: $INCLUDE_DSL_CPE_TRACE_BUFFER"
|
||||||
|
+echo " Include ADSL MIB: $INCLUDE_DSL_ADSL_MIB"
|
||||||
|
+echo " Include ADSL LED: $INCLUDE_ADSL_LED"
|
||||||
|
+echo " Include CEOC: $INCLUDE_DSL_CEOC"
|
||||||
|
+echo " Include config get support: $INCLUDE_DSL_CONFIG_GET"
|
||||||
|
+echo " Include System i/f configuration: $INCLUDE_DSL_SYSTEM_INTERFACE"
|
||||||
|
+echo " Include Resource Statistics: $INCLUDE_DSL_RESOURCE_STATISTICS"
|
||||||
|
+echo " Include Framing Parameters: $INCLUDE_DSL_FRAMING_PARAMETERS"
|
||||||
|
+echo " Include G997 Line Inventory: $INCLUDE_DSL_G997_LINE_INVENTORY"
|
||||||
|
+echo " Include G997 Framing Parameters: $INCLUDE_DSL_G997_FRAMING_PARAMETERS"
|
||||||
|
+echo " Include G997 per tone data: $INCLUDE_DSL_G997_PER_TONE"
|
||||||
|
+echo " Include G997 status: $INCLUDE_DSL_G997_STATUS"
|
||||||
|
+echo " Include G997 alarm: $INCLUDE_DSL_G997_ALARM"
|
||||||
|
+echo " Include DSL Bonding: $INCLUDE_DSL_BONDING"
|
||||||
|
+echo " Include Misc Line Status $INCLUDE_DSL_CPE_MISC_LINE_STATUS"
|
||||||
|
+echo " Include DELT: $INCLUDE_DSL_DELT"
|
||||||
|
+echo " Include DELT data static storage: $DSL_CPE_STATIC_DELT_DATA"
|
||||||
|
+echo " Include PM: $INCLUDE_DSL_PM"
|
||||||
|
+echo " Include PM config: $INCLUDE_DSL_CPE_PM_CONFIG"
|
||||||
|
+echo " Include PM total: $INCLUDE_DSL_CPE_PM_TOTAL_COUNTERS"
|
||||||
|
+echo " Include PM history: $INCLUDE_DSL_CPE_PM_HISTORY"
|
||||||
|
+echo " Include PM showtime: $INCLUDE_DSL_CPE_PM_SHOWTIME_COUNTERS"
|
||||||
|
+echo " Include PM optional: $INCLUDE_DSL_CPE_PM_OPTIONAL_PARAMETERS"
|
||||||
|
+echo " Include PM line: $INCLUDE_DSL_CPE_PM_LINE_COUNTERS"
|
||||||
|
+echo " Include PM line event showtime: $INCLUDE_DSL_CPE_PM_LINE_EVENT_SHOWTIME_COUNTERS"
|
||||||
|
+echo " Include PM channel: $INCLUDE_DSL_CPE_PM_CHANNEL_COUNTERS"
|
||||||
|
+echo " Include PM channel extended: $INCLUDE_DSL_CPE_PM_CHANNEL_EXT_COUNTERS"
|
||||||
|
+echo " Include PM data path: $INCLUDE_DSL_CPE_PM_DATA_PATH_COUNTERS"
|
||||||
|
+echo " Include PM data path failure: $INCLUDE_DSL_CPE_PM_DATA_PATH_FAILURE_COUNTERS"
|
||||||
|
+echo " Include PM ReTx: $INCLUDE_DSL_CPE_PM_RETX_COUNTERS"
|
||||||
|
+echo " Include PM line threshold: $INCLUDE_DSL_CPE_PM_LINE_THRESHOLDS"
|
||||||
|
+echo " Include PM channel threshold: $INCLUDE_DSL_CPE_PM_CHANNEL_THRESHOLDS"
|
||||||
|
+echo " Include PM data path threshold: $INCLUDE_DSL_CPE_PM_DATA_PATH_THRESHOLDS"
|
||||||
|
+echo " Include PM ReTx threshold: $INCLUDE_DSL_CPE_PM_RETX_THRESHOLDS"
|
||||||
|
+echo " Include FW memory free support: $INCLUDE_DSL_FIRMWARE_MEMORY_FREE"
|
||||||
|
+echo "----------------------- deprectated ! ----------------------------------"
|
||||||
|
+echo " Include PM line failure: $INCLUDE_DSL_CPE_PM_LINE_FAILURE_COUNTERS"
|
||||||
|
+echo ""
|
||||||
|
+echo " Settings:"
|
||||||
|
+echo " Configure options: $CONFIGURE_OPTIONS"
|
||||||
|
+echo "------------------------------------------------------------------------"
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_CONFIG_FILES([Makefile src/Makefile])
|
||||||
|
--- a/src/Makefile.am
|
||||||
|
+++ b/src/Makefile.am
|
||||||
|
@@ -303,7 +303,7 @@ if KERNEL_2_6
|
||||||
|
drv_dsl_cpe_api_OBJS = "$(subst .c,.o,$(filter %.c,$(drv_dsl_cpe_api_SOURCES)))"
|
||||||
|
|
||||||
|
drv_dsl_cpe_api.ko: $(drv_dsl_cpe_api_SOURCES)
|
||||||
|
- @echo -e "drv_dsl_cpe_api: Making Linux 2.6.x kernel object"
|
||||||
|
+ @echo "drv_dsl_cpe_api: Making Linux 2.6.x kernel object"
|
||||||
|
if test ! -e common/drv_dsl_cpe_api.c ; then \
|
||||||
|
echo "copy source files (as links only!)"; \
|
||||||
|
for f in $(filter %.c,$(drv_dsl_cpe_api_SOURCES)); do \
|
||||||
|
@@ -311,10 +311,10 @@ drv_dsl_cpe_api.ko: $(drv_dsl_cpe_api_SO
|
||||||
|
cp -s $(addprefix @abs_srcdir@/,$$f) $(PWD)/`dirname $$f`/ ; \
|
||||||
|
done \
|
||||||
|
fi
|
||||||
|
- @echo -e "# drv_dsl_cpe_api: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
|
||||||
|
- @echo -e "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild
|
||||||
|
- @echo -e "$(subst .ko,,$@)-y := $(drv_dsl_cpe_api_OBJS)" >> $(PWD)/Kbuild
|
||||||
|
- @echo -e "EXTRA_CFLAGS := $(CFLAGS) -DHAVE_CONFIG_H $(drv_dsl_cpe_api_CFLAGS) $(DSL_DRIVER_INCL_PATH) $(IFXOS_INCLUDE_PATH) -I@abs_srcdir@/include -I$(PWD)/include" >> $(PWD)/Kbuild
|
||||||
|
+ @echo "# drv_dsl_cpe_api: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
|
||||||
|
+ @echo "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild
|
||||||
|
+ @echo "$(subst .ko,,$@)-y := $(drv_dsl_cpe_api_OBJS)" >> $(PWD)/Kbuild
|
||||||
|
+ @echo "EXTRA_CFLAGS := $(CFLAGS) -DHAVE_CONFIG_H $(drv_dsl_cpe_api_CFLAGS) $(DSL_DRIVER_INCL_PATH) $(IFXOS_INCLUDE_PATH) -I@abs_srcdir@/include -I$(PWD)/include" >> $(PWD)/Kbuild
|
||||||
|
$(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules
|
||||||
|
|
||||||
|
clean-generic:
|
||||||
Loading…
Reference in New Issue
Block a user