package/system/ltq-dsl/patches/500-portability.patch

   1 --- a/configure.in
   2 +++ b/configure.in
   3 @@ -310,7 +310,7 @@
   4  AC_ARG_ENABLE(kernelbuild,
   5      AC_HELP_STRING(--enable-kernel-build=x,Set the target kernel build path),
   6      [
   7 -        if test -e $enableval/include/linux/autoconf.h; then
   8 +        if test -e $enableval/include/linux/autoconf.h -o -e $enableval/include/generated/autoconf.h; then
   9              AC_SUBST([KERNEL_BUILD_PATH],[$enableval])
  10          else
  11              AC_MSG_ERROR([The kernel build directory is not valid or not configured!])
  12 @@ -333,12 +333,12 @@
  13              echo Set the lib_ifxos include path $enableval
  14              AC_SUBST([IFXOS_INCLUDE_PATH],[$enableval])
  15          else
  16 -            echo -e Set the default lib_ifxos include path $DEFAULT_IFXOS_INCLUDE_PATH
  17 +            echo Set the default lib_ifxos include path $DEFAULT_IFXOS_INCLUDE_PATH
  18              AC_SUBST([IFXOS_INCLUDE_PATH],[$DEFAULT_IFXOS_INCLUDE_PATH])
  19          fi
  20      ],
  21      [
  22 -        echo -e Set the default lib_ifxos include path $DEFAULT_IFXOS_INCLUDE_PATH
  23 +        echo Set the default lib_ifxos include path $DEFAULT_IFXOS_INCLUDE_PATH
  24          AC_SUBST([IFXOS_INCLUDE_PATH],[$DEFAULT_IFXOS_INCLUDE_PATH])
  25      ]
  26  )
  27 @@ -1702,73 +1702,73 @@
  28  AC_SUBST([DISTCHECK_CONFIGURE_PARAMS],[$CONFIGURE_OPTIONS])
  29
  30  AC_CONFIG_COMMANDS_PRE([
  31 -echo -e "------------------------------------------------------------------------"
  32 -echo -e " Configuration for drv_dsl_cpe_api:"
  33 -echo -e "  Configure model type:             $DSL_CONFIG_MODEL_TYPE"
  34 -echo -e "  Source code location:             $srcdir"
  35 -echo -e "  Compiler:                         $CC"
  36 -echo -e "  Compiler c-flags:                 $CFLAGS"
  37 -echo -e "  Extra compiler c-flags:           $EXTRA_DRV_CFLAGS"
  38 -echo -e "  Host System Type:                 $host"
  39 -echo -e "  Install path:                     $prefix"
  40 -echo -e "  Linux kernel include path:        $KERNEL_INCL_PATH"
  41 -echo -e "  Linux kernel build path:          $KERNEL_BUILD_PATH"
  42 -echo -e "  Linux kernel architecture:        $KERNEL_ARCH"
  43 -echo -e "  Include IFXOS:                    $INCLUDE_DSL_CPE_API_IFXOS_SUPPORT"
  44 -echo -e "  IFXOS include path:               $IFXOS_INCLUDE_PATH"
  45 -echo -e "  Driver Include Path               $DSL_DRIVER_INCL_PATH"
  46 -echo -e "  DSL device:                       $DSL_DEVICE_NAME"
  47 -echo -e "  Max device number:                $DSL_DRV_MAX_DEVICE_NUMBER"
  48 -echo -e "  Channels per line:                $DSL_CHANNELS_PER_LINE"
  49 -echo -e "  Build lib (only for kernel 2.6)   $DSL_CPE_API_LIBRARY_BUILD_2_6"
  50 -echo -e "  DSL data led flash frequency:     $DSL_DATA_LED_FLASH_FREQUENCY Hz"
  51 -echo -e "  Disable debug prints:             $DSL_DEBUG_DISABLE"
  52 -echo -e "  Preselection of max. debug level: $DSL_DBG_MAX_LEVEL_SET"
  53 -echo -e "  Preselected max. debug level:     $DSL_DBG_MAX_LEVEL_PRE"
  54 -echo -e "  Include deprecated functions:     $INCLUDE_DEPRECATED"
  55 -echo -e "  Include Device Exception Codes:   $INCLUDE_DEVICE_EXCEPTION_CODES"
  56 -echo -e "  Include FW request support:       $INCLUDE_FW_REQUEST_SUPPORT"
  57 -echo -e "  Include ADSL trace buffer:        $INCLUDE_DSL_CPE_TRACE_BUFFER"
  58 -echo -e "  Include ADSL MIB:                 $INCLUDE_DSL_ADSL_MIB"
  59 -echo -e "  Include ADSL LED:                 $INCLUDE_ADSL_LED"
  60 -echo -e "  Include CEOC:                     $INCLUDE_DSL_CEOC"
  61 -echo -e "  Include config get support:       $INCLUDE_DSL_CONFIG_GET"
  62 -echo -e "  Include System i/f configuration: $INCLUDE_DSL_SYSTEM_INTERFACE"
  63 -echo -e "  Include Resource Statistics:      $INCLUDE_DSL_RESOURCE_STATISTICS"
  64 -echo -e "  Include Framing Parameters:       $INCLUDE_DSL_FRAMING_PARAMETERS"
  65 -echo -e "  Include G997 Line Inventory:      $INCLUDE_DSL_G997_LINE_INVENTORY"
  66 -echo -e "  Include G997 Framing Parameters:  $INCLUDE_DSL_G997_FRAMING_PARAMETERS"
  67 -echo -e "  Include G997 per tone data:       $INCLUDE_DSL_G997_PER_TONE"
  68 -echo -e "  Include G997 status:              $INCLUDE_DSL_G997_STATUS"
  69 -echo -e "  Include G997 alarm:               $INCLUDE_DSL_G997_ALARM"
  70 -echo -e "  Include DSL Bonding:              $INCLUDE_DSL_BONDING"
  71 -echo -e "  Include Misc Line Status          $INCLUDE_DSL_CPE_MISC_LINE_STATUS"
  72 -echo -e "  Include DELT:                     $INCLUDE_DSL_DELT"
  73 -echo -e "  Include DELT data static storage: $DSL_CPE_STATIC_DELT_DATA"
  74 -echo -e "  Include PM:                       $INCLUDE_DSL_PM"
  75 -echo -e "  Include PM config:                $INCLUDE_DSL_CPE_PM_CONFIG"
  76 -echo -e "  Include PM total:                 $INCLUDE_DSL_CPE_PM_TOTAL_COUNTERS"
  77 -echo -e "  Include PM history:               $INCLUDE_DSL_CPE_PM_HISTORY"
  78 -echo -e "  Include PM showtime:              $INCLUDE_DSL_CPE_PM_SHOWTIME_COUNTERS"
  79 -echo -e "  Include PM optional:              $INCLUDE_DSL_CPE_PM_OPTIONAL_PARAMETERS"
  80 -echo -e "  Include PM line:                  $INCLUDE_DSL_CPE_PM_LINE_COUNTERS"
  81 -echo -e "  Include PM line event showtime:   $INCLUDE_DSL_CPE_PM_LINE_EVENT_SHOWTIME_COUNTERS"
  82 -echo -e "  Include PM channel:               $INCLUDE_DSL_CPE_PM_CHANNEL_COUNTERS"
  83 -echo -e "  Include PM channel extended:      $INCLUDE_DSL_CPE_PM_CHANNEL_EXT_COUNTERS"
  84 -echo -e "  Include PM data path:             $INCLUDE_DSL_CPE_PM_DATA_PATH_COUNTERS"
  85 -echo -e "  Include PM data path failure:     $INCLUDE_DSL_CPE_PM_DATA_PATH_FAILURE_COUNTERS"
  86 -echo -e "  Include PM ReTx:                  $INCLUDE_DSL_CPE_PM_RETX_COUNTERS"
  87 -echo -e "  Include PM line threshold:        $INCLUDE_DSL_CPE_PM_LINE_THRESHOLDS"
  88 -echo -e "  Include PM channel threshold:     $INCLUDE_DSL_CPE_PM_CHANNEL_THRESHOLDS"
  89 -echo -e "  Include PM data path threshold:   $INCLUDE_DSL_CPE_PM_DATA_PATH_THRESHOLDS"
  90 -echo -e "  Include PM ReTx threshold:        $INCLUDE_DSL_CPE_PM_RETX_THRESHOLDS"
  91 -echo -e "  Include FW memory free support:   $INCLUDE_DSL_FIRMWARE_MEMORY_FREE"
  92 -echo -e "----------------------- deprectated ! ----------------------------------"
  93 -echo -e "  Include PM line failure:          $INCLUDE_DSL_CPE_PM_LINE_FAILURE_COUNTERS"
  94 -echo -e ""
  95 -echo -e " Settings:"
  96 -echo -e "  Configure options:                $CONFIGURE_OPTIONS"
  97 -echo -e "------------------------------------------------------------------------"
  98 +echo "------------------------------------------------------------------------"
  99 +echo " Configuration for drv_dsl_cpe_api:"
 100 +echo "  Configure model type:             $DSL_CONFIG_MODEL_TYPE"
 101 +echo "  Source code location:             $srcdir"
 102 +echo "  Compiler:                         $CC"
 103 +echo "  Compiler c-flags:                 $CFLAGS"
 104 +echo "  Extra compiler c-flags:           $EXTRA_DRV_CFLAGS"
 105 +echo "  Host System Type:                 $host"
 106 +echo "  Install path:                     $prefix"
 107 +echo "  Linux kernel include path:        $KERNEL_INCL_PATH"
 108 +echo "  Linux kernel build path:          $KERNEL_BUILD_PATH"
 109 +echo "  Linux kernel architecture:        $KERNEL_ARCH"
 110 +echo "  Include IFXOS:                    $INCLUDE_DSL_CPE_API_IFXOS_SUPPORT"
 111 +echo "  IFXOS include path:               $IFXOS_INCLUDE_PATH"
 112 +echo "  Driver Include Path               $DSL_DRIVER_INCL_PATH"
 113 +echo "  DSL device:                       $DSL_DEVICE_NAME"
 114 +echo "  Max device number:                $DSL_DRV_MAX_DEVICE_NUMBER"
 115 +echo "  Channels per line:                $DSL_CHANNELS_PER_LINE"
 116 +echo "  Build lib (only for kernel 2.6)   $DSL_CPE_API_LIBRARY_BUILD_2_6"
 117 +echo "  DSL data led flash frequency:     $DSL_DATA_LED_FLASH_FREQUENCY Hz"
 118 +echo "  Disable debug prints:             $DSL_DEBUG_DISABLE"
 119 +echo "  Preselection of max. debug level: $DSL_DBG_MAX_LEVEL_SET"
 120 +echo "  Preselected max. debug level:     $DSL_DBG_MAX_LEVEL_PRE"
 121 +echo "  Include deprecated functions:     $INCLUDE_DEPRECATED"
 122 +echo "  Include Device Exception Codes:   $INCLUDE_DEVICE_EXCEPTION_CODES"
 123 +echo "  Include FW request support:       $INCLUDE_FW_REQUEST_SUPPORT"
 124 +echo "  Include ADSL trace buffer:        $INCLUDE_DSL_CPE_TRACE_BUFFER"
 125 +echo "  Include ADSL MIB:                 $INCLUDE_DSL_ADSL_MIB"
 126 +echo "  Include ADSL LED:                 $INCLUDE_ADSL_LED"
 127 +echo "  Include CEOC:                     $INCLUDE_DSL_CEOC"
 128 +echo "  Include config get support:       $INCLUDE_DSL_CONFIG_GET"
 129 +echo "  Include System i/f configuration: $INCLUDE_DSL_SYSTEM_INTERFACE"
 130 +echo "  Include Resource Statistics:      $INCLUDE_DSL_RESOURCE_STATISTICS"
 131 +echo "  Include Framing Parameters:       $INCLUDE_DSL_FRAMING_PARAMETERS"
 132 +echo "  Include G997 Line Inventory:      $INCLUDE_DSL_G997_LINE_INVENTORY"
 133 +echo "  Include G997 Framing Parameters:  $INCLUDE_DSL_G997_FRAMING_PARAMETERS"
 134 +echo "  Include G997 per tone data:       $INCLUDE_DSL_G997_PER_TONE"
 135 +echo "  Include G997 status:              $INCLUDE_DSL_G997_STATUS"
 136 +echo "  Include G997 alarm:               $INCLUDE_DSL_G997_ALARM"
 137 +echo "  Include DSL Bonding:              $INCLUDE_DSL_BONDING"
 138 +echo "  Include Misc Line Status          $INCLUDE_DSL_CPE_MISC_LINE_STATUS"
 139 +echo "  Include DELT:                     $INCLUDE_DSL_DELT"
 140 +echo "  Include DELT data static storage: $DSL_CPE_STATIC_DELT_DATA"
 141 +echo "  Include PM:                       $INCLUDE_DSL_PM"
 142 +echo "  Include PM config:                $INCLUDE_DSL_CPE_PM_CONFIG"
 143 +echo "  Include PM total:                 $INCLUDE_DSL_CPE_PM_TOTAL_COUNTERS"
 144 +echo "  Include PM history:               $INCLUDE_DSL_CPE_PM_HISTORY"
 145 +echo "  Include PM showtime:              $INCLUDE_DSL_CPE_PM_SHOWTIME_COUNTERS"
 146 +echo "  Include PM optional:              $INCLUDE_DSL_CPE_PM_OPTIONAL_PARAMETERS"
 147 +echo "  Include PM line:                  $INCLUDE_DSL_CPE_PM_LINE_COUNTERS"
 148 +echo "  Include PM line event showtime:   $INCLUDE_DSL_CPE_PM_LINE_EVENT_SHOWTIME_COUNTERS"
 149 +echo "  Include PM channel:               $INCLUDE_DSL_CPE_PM_CHANNEL_COUNTERS"
 150 +echo "  Include PM channel extended:      $INCLUDE_DSL_CPE_PM_CHANNEL_EXT_COUNTERS"
 151 +echo "  Include PM data path:             $INCLUDE_DSL_CPE_PM_DATA_PATH_COUNTERS"
 152 +echo "  Include PM data path failure:     $INCLUDE_DSL_CPE_PM_DATA_PATH_FAILURE_COUNTERS"
 153 +echo "  Include PM ReTx:                  $INCLUDE_DSL_CPE_PM_RETX_COUNTERS"
 154 +echo "  Include PM line threshold:        $INCLUDE_DSL_CPE_PM_LINE_THRESHOLDS"
 155 +echo "  Include PM channel threshold:     $INCLUDE_DSL_CPE_PM_CHANNEL_THRESHOLDS"
 156 +echo "  Include PM data path threshold:   $INCLUDE_DSL_CPE_PM_DATA_PATH_THRESHOLDS"
 157 +echo "  Include PM ReTx threshold:        $INCLUDE_DSL_CPE_PM_RETX_THRESHOLDS"
 158 +echo "  Include FW memory free support:   $INCLUDE_DSL_FIRMWARE_MEMORY_FREE"
 159 +echo "----------------------- deprectated ! ----------------------------------"
 160 +echo "  Include PM line failure:          $INCLUDE_DSL_CPE_PM_LINE_FAILURE_COUNTERS"
 161 +echo ""
 162 +echo " Settings:"
 163 +echo "  Configure options:                $CONFIGURE_OPTIONS"
 164 +echo "------------------------------------------------------------------------"
 165  ])
 166
 167  AC_CONFIG_FILES([Makefile src/Makefile])
 168 --- a/src/Makefile.am
 169 +++ b/src/Makefile.am
 170 @@ -303,7 +303,7 @@
 171  drv_dsl_cpe_api_OBJS = "$(subst .c,.o,$(filter %.c,$(drv_dsl_cpe_api_SOURCES)))"
 172
 173  drv_dsl_cpe_api.ko: $(drv_dsl_cpe_api_SOURCES)
 174 -       @echo -e "drv_dsl_cpe_api: Making Linux 2.6.x kernel object"
 175 +       @echo "drv_dsl_cpe_api: Making Linux 2.6.x kernel object"
 176         if test ! -e common/drv_dsl_cpe_api.c ; then \
 177                 echo "copy source files (as links only!)"; \
 178                 for f in $(filter %.c,$(drv_dsl_cpe_api_SOURCES)); do \
 179 @@ -311,10 +311,10 @@
 180                         cp -s $(addprefix @abs_srcdir@/,$$f) $(PWD)/`dirname $$f`/ ; \
 181                 done \
 182         fi
 183 -       @echo -e "# drv_dsl_cpe_api: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
 184 -       @echo -e "obj-m := $(subst .ko,.o,$@)"                  >> $(PWD)/Kbuild
 185 -       @echo -e "$(subst .ko,,$@)-y := $(drv_dsl_cpe_api_OBJS)"        >> $(PWD)/Kbuild
 186 -       @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
 187 +       @echo "# drv_dsl_cpe_api: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild
 188 +       @echo "obj-m := $(subst .ko,.o,$@)"                     >> $(PWD)/Kbuild
 189 +       @echo "$(subst .ko,,$@)-y := $(drv_dsl_cpe_api_OBJS)"   >> $(PWD)/Kbuild
 190 +       @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
 191         $(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules
 192
 193  clean-generic:
 194 --- a/src/include/drv_dsl_cpe_os_linux.h
 195 +++ b/src/include/drv_dsl_cpe_os_linux.h
 196 @@ -16,8 +16,6 @@
 197     extern "C" {
 198  #endif
 199
 200 -#include <asm/ioctl.h>
 201 -#include <generated/autoconf.h>
 202  #include <linux/module.h>
 203  #include <linux/kernel.h>
 204  #include <linux/init.h>
 205 @@ -26,8 +24,10 @@
 206  #include <linux/spinlock.h>
 207  #include <linux/sched.h>
 208
 209 -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
 210 -   #include <generated/utsrelease.h>
 211 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
 212 +#include <linux/utsrelease.h>
 213 +#else
 214 +#include <generated/utsrelease.h>
 215  #endif
 216
 217  #include <linux/types.h>
 218 @@ -39,7 +39,8 @@
 219  #include <linux/delay.h>
 220  #include <linux/poll.h>
 221  #include <asm/uaccess.h>
 222 -#include <linux/smp_lock.h>
 223 +//#include <linux/smp_lock.h>
 224 +#include <asm/ioctl.h>
 225
 226  #ifdef INCLUDE_DSL_CPE_API_IFXOS_SUPPORT
 227  /** IFXOS includes*/