From: Alin Năstac Date: Tue, 5 Dec 2006 21:19:35 +0000 (+0000) Subject: Fix broken compilation against kernel 2.6.19 (#157230). Move patches to distfiles... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=146f9db7a9ce964dd7706fd1caaf1c53e36edd87;p=gentoo.git Fix broken compilation against kernel 2.6.19 (#157230). Move patches to distfiles mirrors. Package-Manager: portage-2.1.1-r1 --- diff --git a/net-dialup/bewan-adsl/Manifest b/net-dialup/bewan-adsl/Manifest index f5ff9c153478..cd03b67c49f5 100644 --- a/net-dialup/bewan-adsl/Manifest +++ b/net-dialup/bewan-adsl/Manifest @@ -1,38 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX bewan-adsl-0.9.3-kernel-2.6.18.patch 13211 RMD160 c22929ea9f8ec4e74b91f2cbe77743b9be2da859 SHA1 318738f2f938cbea7ee35d911dd7da19c244d4be SHA256 1615291f5e6540310910bbc88c75b6025bf4cb0cd66719e086e3789730816fcc -MD5 fcf8551d977b35493917d1e4a55c23e4 files/bewan-adsl-0.9.3-kernel-2.6.18.patch 13211 -RMD160 c22929ea9f8ec4e74b91f2cbe77743b9be2da859 files/bewan-adsl-0.9.3-kernel-2.6.18.patch 13211 -SHA256 1615291f5e6540310910bbc88c75b6025bf4cb0cd66719e086e3789730816fcc files/bewan-adsl-0.9.3-kernel-2.6.18.patch 13211 -AUX bewan-adsl-0.9.3-no-strip.patch 868 RMD160 48e38949f3eab501f29dc71cb264cc5c2ebc010d SHA1 4887471a6b8e2be5e321a1d9efda7935a58a1cec SHA256 bb172cb26af3b98bc7c6f1535d3af1dad5d93f3833bc457843a9e0c99f1644a0 -MD5 0ed7d2c36f8eb0bdfafe2bd5c6264c29 files/bewan-adsl-0.9.3-no-strip.patch 868 -RMD160 48e38949f3eab501f29dc71cb264cc5c2ebc010d files/bewan-adsl-0.9.3-no-strip.patch 868 -SHA256 bb172cb26af3b98bc7c6f1535d3af1dad5d93f3833bc457843a9e0c99f1644a0 files/bewan-adsl-0.9.3-no-strip.patch 868 -AUX bewan-adsl-0.9.3-smp.patch 415 RMD160 aa5ccde8b94c0b434afbd9705fc663b0000a5658 SHA1 47a3745f4ea06cb265258cb24cef627a56cbf8a9 SHA256 518a1d765b6c52cb8dcf70cba910388da2f99e3c28d5d048d7d81a7dd0b9e2e3 -MD5 9634edac04690ec8717dc703c52dde0a files/bewan-adsl-0.9.3-smp.patch 415 -RMD160 aa5ccde8b94c0b434afbd9705fc663b0000a5658 files/bewan-adsl-0.9.3-smp.patch 415 -SHA256 518a1d765b6c52cb8dcf70cba910388da2f99e3c28d5d048d7d81a7dd0b9e2e3 files/bewan-adsl-0.9.3-smp.patch 415 DIST A1012-A1006-A904-A888-A983-0.9.3.tgz 1176291 RMD160 50cd3201b05e931e541bd9a2dc4711c1ac044ec8 SHA1 977172f517e850f19029e3c6a0da07a7ca1e8269 SHA256 48a789f7ef026248a4a666ff5da952ef458d1a1ae7a7bc162a6d01e0ac38a954 -EBUILD bewan-adsl-0.9.3-r2.ebuild 2951 RMD160 07b7a901a47f65ee1dbb475a1fcb64311f432c3d SHA1 e972d336e75e3f4b7b4751c1072974c7990efd8c SHA256 2c72100f6ad64aafd3060febd75b648d3500c6d5bc687c70c7288b74763717e9 -MD5 cd9bd44a34be1ed08dd02c8338d30cdf bewan-adsl-0.9.3-r2.ebuild 2951 -RMD160 07b7a901a47f65ee1dbb475a1fcb64311f432c3d bewan-adsl-0.9.3-r2.ebuild 2951 -SHA256 2c72100f6ad64aafd3060febd75b648d3500c6d5bc687c70c7288b74763717e9 bewan-adsl-0.9.3-r2.ebuild 2951 -MISC ChangeLog 2798 RMD160 17e775cf3d5c57b39caaeee786770d166b052306 SHA1 cdb302e994bd0d8c0c634295b3e96e955e7b8061 SHA256 041928ad2c9eb7d45f528fac3cff1d129b3764584df810ae511bf7c829d17e43 -MD5 d83ed0f546e2ae83833cc11fe3916b7a ChangeLog 2798 -RMD160 17e775cf3d5c57b39caaeee786770d166b052306 ChangeLog 2798 -SHA256 041928ad2c9eb7d45f528fac3cff1d129b3764584df810ae511bf7c829d17e43 ChangeLog 2798 +DIST bewan-adsl-0.9.3-patches-20061205.tar.gz 5082 RMD160 30c2c4488cc3491750c83440f8b15e00ea5f1bd1 SHA1 37ce381f18437533e089742cdd937da69ca91cd1 SHA256 26541229ceddc1f8ac682ba876ecab781392ebe3014bb095b0bf7ea9ff794ad4 +EBUILD bewan-adsl-0.9.3-r2.ebuild 3019 RMD160 e7d0557c810adfaf3d849e2dfd9419847461c28d SHA1 58a206281e34ad4133f283f01de68568b03eda57 SHA256 acf81390ecbe4fd0f9a48c6e9ce30021de6e012cc7f8ef65db554e237dde6e3a +MD5 1be6e0900efd31931a4c764c9c752a40 bewan-adsl-0.9.3-r2.ebuild 3019 +RMD160 e7d0557c810adfaf3d849e2dfd9419847461c28d bewan-adsl-0.9.3-r2.ebuild 3019 +SHA256 acf81390ecbe4fd0f9a48c6e9ce30021de6e012cc7f8ef65db554e237dde6e3a bewan-adsl-0.9.3-r2.ebuild 3019 +MISC ChangeLog 3096 RMD160 cc6b111e65d6313324332910d7121cbf65d0d3ab SHA1 2ed1ec89e421d3469a174dc9a92f5628a9bcb8ce SHA256 f4a0bda2452dbbed3842a7b5c5adb6384da9e7858661b69a69fc4d4292f96c42 +MD5 e1d57ce350aa06823ad3681a431123eb ChangeLog 3096 +RMD160 cc6b111e65d6313324332910d7121cbf65d0d3ab ChangeLog 3096 +SHA256 f4a0bda2452dbbed3842a7b5c5adb6384da9e7858661b69a69fc4d4292f96c42 ChangeLog 3096 MISC metadata.xml 244 RMD160 d019a30c66a0973b91a78b298ead869bc95e116e SHA1 8c372c5959e7fdbd256a2d3f33a2cc6b410d9fc5 SHA256 8442a611ecdc33f97baafbc1bab688260b422f67f2bdef929279263ecb2e61b6 MD5 a8f204f0f809d594d055af2f544329c7 metadata.xml 244 RMD160 d019a30c66a0973b91a78b298ead869bc95e116e metadata.xml 244 SHA256 8442a611ecdc33f97baafbc1bab688260b422f67f2bdef929279263ecb2e61b6 metadata.xml 244 -MD5 1054945beb059f16ad93ccf247ab664b files/digest-bewan-adsl-0.9.3-r2 292 -RMD160 52b3594262473a39daaf2105a4edca91135ac155 files/digest-bewan-adsl-0.9.3-r2 292 -SHA256 4a7fb1dc4bbe1b7d9e132ea075423130865afe729f9f0370646a534af81ed500 files/digest-bewan-adsl-0.9.3-r2 292 +MD5 59cfc3939cf94e4339acc5a483d968ff files/digest-bewan-adsl-0.9.3-r2 587 +RMD160 2a944b34af8320e82f52538f7a3f2a31bfe455af files/digest-bewan-adsl-0.9.3-r2 587 +SHA256 e892f93ab4e43136b93df677d042504db3b508167d9ab576d119b3750af6315f files/digest-bewan-adsl-0.9.3-r2 587 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFXrm03sf9c6kjmR8RApP9AKCEu90M8ujWjFtH7UY9KU1wBP7GDwCfdyzg -rLJUlEBO1GWlVZP/mdjIsNw= -=9vmz +iD8DBQFFdeJi3sf9c6kjmR8RAhbwAKCiJq+cE5uw+Q0RD2tQuwkvk2AO5QCfSrv/ +6zNGMRL098Wv3rdgH7OUK3g= +=bN8n -----END PGP SIGNATURE----- diff --git a/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-kernel-2.6.18.patch b/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-kernel-2.6.18.patch deleted file mode 100644 index 3e2f668496c0..000000000000 --- a/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-kernel-2.6.18.patch +++ /dev/null @@ -1,404 +0,0 @@ -diff -Nru unicorn.orig/amu/amas.c unicorn/amu/amas.c ---- unicorn.orig/amu/amas.c 2006-10-05 01:21:33.937563500 +0300 -+++ unicorn/amu/amas.c 2006-10-05 01:21:19.608668000 +0300 -@@ -23,9 +23,10 @@ - // ADSL Modem Software calls this function to report any state changes - void AMSW_ANT_reportModemStateChange(AMSW_ModemState p_ModemState) - { -+ char *s; -+ - g_ModemState = p_ModemState; - -- char *s; - switch(p_ModemState) - { - case C_AMSW_IDLE : s = "IDLE"; break; -diff -Nru unicorn.orig/amu/amu.c unicorn/amu/amu.c ---- unicorn.orig/amu/amu.c 2006-10-05 01:21:33.937563500 +0300 -+++ unicorn/amu/amu.c 2006-10-05 01:21:19.608668000 +0300 -@@ -77,8 +77,14 @@ - extern unsigned long Vendor_Id_code_Globspan; - unsigned long Vendor_Id_code_Globspan=0; - --extern "C" void HandleAtmError(void); --extern "C" void HandleLeds(void); -+#ifdef __cplusplus -+extern "C" { -+#endif -+ void HandleAtmError(void); -+ void HandleLeds(void); -+#ifdef __cplusplus -+} -+#endif - - unsigned long amu_init_modem(unsigned short MODE); - unsigned long amu_init_modem(unsigned short MODE) -@@ -165,24 +171,27 @@ - return l_RetCode; - } - --void AMUTask(unsigned long,unsigned long , unsigned long , unsigned long ) -+void AMUTask(unsigned long Arg1, unsigned long Arg2, unsigned long Arg3, unsigned long Arg4) - { - unsigned long l_RetCode = C_AMSW_REJ; - //static int l_Lit = 0; - static bool PM_toggle = TRUE; - -- PRINT_ERROR("FmPollingRate=%ldms,InitTimeout=%ldms,ActTimeout=%ld\n", -- FmPollingRate,InitTimeout,ActTimeout); -- - unsigned long PM_FM_POLLING_RATE = FmPollingRate; - unsigned long WAITFOR_SHOWTIME_COUNT = InitTimeout / PM_FM_POLLING_RATE; - unsigned long WAITFOR_INIT_COUNT = ActTimeout / PM_FM_POLLING_RATE; - unsigned long RETRY_WAIT_TIME = RETRY_WAIT_TIME_MIN_MSEC / PM_FM_POLLING_RATE; -- if (RetryTime > RETRY_WAIT_TIME_MIN_MSEC) // STM Gian Set RetryTime Only if is Bigger then minimum value -- RETRY_WAIT_TIME = RetryTime / PM_FM_POLLING_RATE; - unsigned long INIT_POLLING_TIME = 5; //(??????) - unsigned long WAITFOR_DISORDERLY_COUNT = 3; - -+ UINT delay = 0; -+ -+ if (RetryTime > RETRY_WAIT_TIME_MIN_MSEC) // STM Gian Set RetryTime Only if is Bigger then minimum value -+ RETRY_WAIT_TIME = RetryTime / PM_FM_POLLING_RATE; -+ -+ PRINT_ERROR("FmPollingRate=%ldms,InitTimeout=%ldms,ActTimeout=%ld\n", -+ FmPollingRate,InitTimeout,ActTimeout); -+ - NEAR_LCDNI_COUNT = LCD_Trig / PM_FM_POLLING_RATE; - NEAR_LCDI_COUNT = NEAR_LCDNI_COUNT; - NEAR_LOS_COUNT = LOS_LOF_Trig / PM_FM_POLLING_RATE; -@@ -194,8 +203,6 @@ - FAR_LOS_SHORT_COUNT = NEAR_LOS_COUNT; - FAR_LOF_SHORT_COUNT = NEAR_LOS_COUNT; - -- UINT delay = 0; -- - while (amu_go) - { - xtm_wkafter(500); -@@ -279,7 +286,7 @@ - g_WaitForDisorderly++; - if(g_WaitForDisorderly >= WAITFOR_DISORDERLY_COUNT) - { -- -+ int i; - - // if (RetryTime != 0) - // msw_report_event(AMU_EVENT_RETRY,0); -@@ -297,7 +304,7 @@ - if(l_RetCode != C_AMSW_ACK) { - PRINT_ERROR("Error in AMSW_ANT_requestModemStateChange(C_AMSW_IDLE) = %d\n", l_RetCode); - } -- else for (int i=0; i<6; i++) -+ else for (i=0; i<6; i++) - { - if (g_ModemState == C_AMSW_IDLE || GlobalRemove) break; - xtm_wkafter(500); -@@ -361,8 +368,8 @@ - //####################### Loss Of Signal ############################## - - if( ((g_def_bitmap_set.near_end.status & LOS) == LOS) || -- ((g_def_bitmap_set.near_end.status & LOS) == 0) && -- ((g_def_bitmap_set.near_end.change & LOS) == LOS) ) -+ (((g_def_bitmap_set.near_end.status & LOS) == 0) && -+ ((g_def_bitmap_set.near_end.change & LOS) == LOS)) ) - { - g_NEAR_LOS++; - } -@@ -371,8 +378,8 @@ - g_NEAR_LOS = 0; - } - if( ((g_def_bitmap_set.far_end.status & LOS) == LOS) || -- ((g_def_bitmap_set.far_end.status & LOS) == 0) && -- ((g_def_bitmap_set.far_end.change & LOS) == LOS) ) -+ (((g_def_bitmap_set.far_end.status & LOS) == 0) && -+ ((g_def_bitmap_set.far_end.change & LOS) == LOS)) ) - { - g_FAR_LOS++; - } -diff -Nru unicorn.orig/amu/bsp.h unicorn/amu/bsp.h ---- unicorn.orig/amu/bsp.h 2006-10-05 01:21:33.937563500 +0300 -+++ unicorn/amu/bsp.h 2006-10-05 01:21:19.608668000 +0300 -@@ -18,7 +18,9 @@ - #define DMT_IN_PIN0_MASK 0x0001 // GP_IN0 bit 0 - #define DMT_IN_PIN1_MASK 0x0002 // GP_IN1 bit 1 - -+#ifdef __cplusplus - extern "C" { -+#endif - - unsigned short initializeBoard(void); - unsigned long powerUp_Modem_Chipset (unsigned long Chipset); -@@ -26,6 +28,8 @@ - unsigned long pull_Modem_Chipset_out_of_reset(unsigned long Chipset); - unsigned long put_Modem_Chipset_in_reset(unsigned long Chipset); - -+#ifdef __cplusplus - } // extern "C" -+#endif - - #endif -diff -Nru unicorn.orig/amu/bsp_pci.c unicorn/amu/bsp_pci.c ---- unicorn.orig/amu/bsp_pci.c 2006-10-05 01:21:33.937563500 +0300 -+++ unicorn/amu/bsp_pci.c 2006-10-05 01:21:19.608668000 +0300 -@@ -98,10 +98,18 @@ - return 0; - } - --extern "C" void HandleAtmError(void) -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+void HandleAtmError(void) - { - } - --extern "C" void HandleLeds(void) -+void HandleLeds(void) - { - } -+ -+#ifdef __cplusplus -+} -+#endif -diff -Nru unicorn.orig/msw/linrapi.c unicorn/msw/linrapi.c ---- unicorn.orig/msw/linrapi.c 2006-10-05 01:21:19.000000000 +0300 -+++ unicorn/msw/linrapi.c 2006-10-05 01:21:59.555164500 +0300 -@@ -201,7 +201,7 @@ - WARN("__cxa_pure_virtual called\n"); - } - --#if __GNUC__ >= 3 -+#if __GNUC__ >= 3 && defined(__cplusplus) - extern void - __builtin_delete(void *ptr) - { -diff -Nru unicorn.orig/msw/msw.c unicorn/msw/msw.c ---- unicorn.orig/msw/msw.c 2006-10-05 01:21:33.941563750 +0300 -+++ unicorn/msw/msw.c 2006-10-05 01:21:19.608668000 +0300 -@@ -6,7 +6,7 @@ - // Copyright STMicroelectronics 2000 - // Copyright F.H.L.P. 2000 - //---------------------------------------------------------------------- --#include -+// #include - #include "types.h" - #include "tracetool.h" - #include "hal.h" -@@ -27,7 +27,7 @@ - extern bool L3_flag; - extern unsigned long GlobalRemove; - --#if 1 -+#if 0 - extern void *operator new(size_t size) - { - void *ptr; -@@ -186,8 +186,9 @@ - } - else - { -+ int i; - PRINT_ERROR("Waiting 5 sec to verify L3_executed\n"); -- for (int i=0; i<10; i++) -+ for (i=0; i<10; i++) - { - // Abort everything on surprise removal - if (GlobalRemove) return; -diff -Nru unicorn.orig/unicorn_atm/unicorn_atmdrv.c unicorn/unicorn_atm/unicorn_atmdrv.c ---- unicorn.orig/unicorn_atm/unicorn_atmdrv.c 2006-10-05 01:21:33.941563750 +0300 -+++ unicorn/unicorn_atm/unicorn_atmdrv.c 2006-10-05 01:21:19.612668250 +0300 -@@ -101,7 +101,7 @@ - struct unicorn_atmdrv *unicorn_atmdrv = NULL; - - // driver parameters --unsigned char *mac_address=NULL; -+char mac_address[ETH_ALEN*2 + 1] = { 0x0 }; - #if DEBUG - #ifdef ATM_DRIVER - unsigned long DebugLevel=0; // ATM_D,DATA_D -@@ -1293,10 +1293,10 @@ - return 0; - } - --MODULE_PARM(mac_address, "s"); -+module_param_string(mac_address, mac_address, sizeof(mac_address), 0); - #if DEBUG - #ifdef ATM_DRIVER --MODULE_PARM(DebugLevel, "i"); -+module_param(DebugLevel, ulong, 0); - #endif - #endif - -diff -Nru unicorn.orig/unicorn_eth/unicorn_ethdrv.c unicorn/unicorn_eth/unicorn_ethdrv.c ---- unicorn.orig/unicorn_eth/unicorn_ethdrv.c 2006-10-05 01:21:33.941563750 +0300 -+++ unicorn/unicorn_eth/unicorn_ethdrv.c 2006-10-05 01:21:19.612668250 +0300 -@@ -140,12 +140,12 @@ - struct unicorn_ethdrv *unicorn_ethdrv = NULL; - - // driver parameters --static char *if_name = NULL; --static unsigned char *mac_address=NULL; -+static char if_name[IFNAMSIZ] = { 0x0 }; -+static char mac_address[ETH_ALEN*2 + 1] = { 0x0 }; - static int VPI= ATM_VPI_UNSPEC; - static int VCI= ATM_VCI_UNSPEC; --static char *PROTOCOL = NULL; --static char *ENCAPS = NULL; -+static char PROTOCOL[8] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; -+static char ENCAPS[11] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - #if DEBUG - #ifdef ETH_DRIVER - unsigned long DebugLevel=0; // ATM_D,DATA_D -@@ -1355,15 +1355,15 @@ - WARN("\n"); - } - --MODULE_PARM(if_name,"s"); --MODULE_PARM(mac_address, "s"); --MODULE_PARM(VPI, "i"); --MODULE_PARM(VCI, "i"); --MODULE_PARM(PROTOCOL, "s"); --MODULE_PARM(ENCAPS, "s"); -+module_param_string(if_name, if_name, sizeof(if_name), 0); -+module_param_string(mac_address, mac_address, sizeof(mac_address), 0); -+module_param(VPI, int, 0); -+module_param(VCI, int, 0); -+module_param_string(PROTOCOL, PROTOCOL, sizeof(PROTOCOL), 0); -+module_param_string(ENCAPS, ENCAPS, sizeof(ENCAPS), 0); - #if DEBUG - #ifdef ETH_DRIVER --MODULE_PARM(DebugLevel, "i"); -+module_param(DebugLevel, ulong, 0); - #endif - #endif - -diff -Nru unicorn.orig/unicorn_pci/unicorn_pcidrv.c unicorn/unicorn_pci/unicorn_pcidrv.c ---- unicorn.orig/unicorn_pci/unicorn_pcidrv.c 2006-10-05 01:21:33.945564000 +0300 -+++ unicorn/unicorn_pci/unicorn_pcidrv.c 2006-10-05 01:21:19.612668250 +0300 -@@ -2157,38 +2157,25 @@ - } - - /* module parameters for MSW */ --MODULE_PARM(ActivationMode, "i"); --//MODULE_PARM(ActivationTaskTimeout, "i"); --MODULE_PARM(ActTimeout, "i"); --MODULE_PARM(AutoActivation, "i"); --//MODULE_PARM(BreakOnEntry, "i"); --MODULE_PARM(DownstreamRate, "i"); --MODULE_PARM(eocTrace, "i"); --//MODULE_PARM(ExchangeDelay, "i"); --MODULE_PARM(FmPollingRate, "i"); --//MODULE_PARM(g_RefGain, "i"); --MODULE_PARM(g_TeqMode, "i"); --MODULE_PARM(InitTimeout, "i"); --MODULE_PARM(Interoperability, "i"); --MODULE_PARM(LCD_Trig, "i"); --MODULE_PARM(LOS_LOF_Trig, "i"); --MODULE_PARM(LoopbackMode, "i"); --MODULE_PARM(MswDebugLevel, "i"); --MODULE_PARM(RetryTime, "i"); --MODULE_PARM(setINITIALDAC, "i"); --//MODULE_PARM(TrainingDelay, "i"); --//MODULE_PARM(TruncateMode, "i"); --MODULE_PARM(useAFE, "i"); --//MODULE_PARM(useRFC019v, "i"); --//MODULE_PARM(useRFC029v, "i"); --//MODULE_PARM(useRFC033v, "i"); --//MODULE_PARM(useRFC040v, "i"); --MODULE_PARM(useRFC041v, "i"); --//MODULE_PARM(useRFCFixedRate, "i"); --//MODULE_PARM(useVCXO, "i"); --//MODULE_PARM(_no_TS652, "i"); -+module_param(ActivationMode, ulong, 0); -+module_param(ActTimeout, ulong, 0); -+module_param(AutoActivation, ulong, 0); -+module_param(DownstreamRate, ulong, 0); -+module_param(eocTrace, ulong, 0); -+module_param(FmPollingRate, ulong, 0); -+module_param(g_TeqMode, ushort, 0); -+module_param(InitTimeout, ulong, 0); -+module_param(Interoperability, ulong, 0); -+module_param(LCD_Trig, ulong, 0); -+module_param(LOS_LOF_Trig, ulong, 0); -+module_param(LoopbackMode, ulong, 0); -+module_param(MswDebugLevel, ulong, 0); -+module_param(RetryTime, ulong, 0); -+module_param(setINITIALDAC, ulong, 0); -+module_param(useAFE, ulong, 0); -+module_param(useRFC041v, ulong, 0); - #if DEBUG --MODULE_PARM(DebugLevel, "i"); -+module_param(DebugLevel, ulong, 0); - #endif - - static int __init -diff -Nru unicorn.orig/unicorn_usb/unicorn_usbdrv.c unicorn/unicorn_usb/unicorn_usbdrv.c ---- unicorn.orig/unicorn_usb/unicorn_usbdrv.c 2006-10-05 01:21:33.945564000 +0300 -+++ unicorn/unicorn_usb/unicorn_usbdrv.c 2006-10-05 01:21:19.616668500 +0300 -@@ -2289,39 +2289,32 @@ - }; - - /* module parameters for MSW */ --MODULE_PARM(ActivationMode, "i"); --//MODULE_PARM(ActivationTaskTimeout, "i"); --MODULE_PARM(ActTimeout, "i"); --MODULE_PARM(AutoActivation, "i"); --//MODULE_PARM(BreakOnEntry, "i"); --MODULE_PARM(DownstreamRate, "i"); --MODULE_PARM(eocTrace, "i"); --MODULE_PARM(ExchangeDelay, "i"); --MODULE_PARM(FmPollingRate, "i"); --MODULE_PARM(g_RefGain, "i"); --MODULE_PARM(g_TeqMode, "i"); --MODULE_PARM(InitTimeout, "i"); --MODULE_PARM(Interoperability, "i"); --MODULE_PARM(LCD_Trig, "i"); --MODULE_PARM(LOS_LOF_Trig, "i"); --MODULE_PARM(LoopbackMode, "i"); --MODULE_PARM(MswDebugLevel, "i"); --MODULE_PARM(RetryTime, "i"); --//MODULE_PARM(setINITIALDAC, "i"); --MODULE_PARM(TrainingDelay, "i"); --//MODULE_PARM(TruncateMode, "i"); --MODULE_PARM(useAFE, "i"); --MODULE_PARM(useRFC019v, "i"); --MODULE_PARM(useRFC029v, "i"); --//MODULE_PARM(useRFC033v, "i"); --MODULE_PARM(useRFC040v, "i"); --MODULE_PARM(useRFC041v, "i"); --//MODULE_PARM(useRFCFixedRate, "i"); --MODULE_PARM(useVCXO, "i"); --MODULE_PARM(_no_TS652, "i"); --//MODULE_PARM(FrameNumber, "i"); -+module_param(ActivationMode, ulong, 0); -+module_param(ActTimeout, ulong, 0); -+module_param(AutoActivation, ulong, 0); -+module_param(DownstreamRate, ulong, 0); -+module_param(eocTrace, ulong, 0); -+module_param(ExchangeDelay, ulong, 0); -+module_param(FmPollingRate, ulong, 0); -+module_param(g_RefGain, ulong, 0); -+module_param(g_TeqMode, ushort, 0); -+module_param(InitTimeout, ulong, 0); -+module_param(Interoperability, ulong, 0); -+module_param(LCD_Trig, ulong, 0); -+module_param(LOS_LOF_Trig, ulong, 0); -+module_param(LoopbackMode, ulong, 0); -+module_param(MswDebugLevel, ulong, 0); -+module_param(RetryTime, ulong, 0); -+module_param(TrainingDelay, ulong, 0); -+module_param(useAFE, ulong, 0); -+module_param(useRFC019v, ulong, 0); -+module_param(useRFC029v, ulong, 0); -+module_param(useRFC040v, ulong, 0); -+module_param(useRFC041v, ulong, 0); -+module_param(useVCXO, ulong, 0); -+module_param(_no_TS652, ulong, 0); - #if DEBUG --MODULE_PARM(DebugLevel, "i"); -+module_param(DebugLevel, ulong, 0); - #endif - - //---------------------------------------------------------------------- diff --git a/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-no-strip.patch b/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-no-strip.patch deleted file mode 100644 index d8b29cbe1538..000000000000 --- a/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-no-strip.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nru unicorn.orig/tools/Makefile unicorn/tools/Makefile ---- unicorn.orig/tools/Makefile 2003-09-28 11:51:24.000000000 +0300 -+++ unicorn/tools/Makefile 2006-09-27 00:12:31.381904250 +0300 -@@ -24,5 +24,5 @@ - rm -f unicorn_status unicorn_status.cgi oam_ping *.o - - install: all -- $(INSTALL) -s -c unicorn_status $(DESTDIR)$(BINDIR) -- $(INSTALL) -s -c oam_ping $(DESTDIR)$(BINDIR) -+ $(INSTALL) -c unicorn_status $(DESTDIR)$(BINDIR) -+ $(INSTALL) -c oam_ping $(DESTDIR)$(BINDIR) -diff -Nru unicorn.orig/unicorntest/Makefile unicorn/unicorntest/Makefile ---- unicorn.orig/unicorntest/Makefile 2003-09-28 11:48:34.000000000 +0300 -+++ unicorn/unicorntest/Makefile 2006-09-27 00:12:52.979254000 +0300 -@@ -18,4 +18,4 @@ - rm -f unicorntest *.o - - install: all -- $(INSTALL) -s -c unicorntest $(DESTDIR)$(BINDIR) -+ $(INSTALL) -c unicorntest $(DESTDIR)$(BINDIR) diff --git a/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-smp.patch b/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-smp.patch deleted file mode 100644 index 7bcc80dd2c62..000000000000 --- a/net-dialup/bewan-adsl/files/bewan-adsl-0.9.3-smp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur unicorn.orig/msw/linrapi.c unicorn/msw/linrapi.c ---- unicorn.orig/msw/linrapi.c 2006-01-02 18:54:30.000000000 +0200 -+++ unicorn/msw/linrapi.c 2006-02-12 12:38:32.453937500 +0200 -@@ -922,7 +922,7 @@ - #endif - // Hack to try to make it work on SMP !!!! - // Lock the threads to CPU #0 -- set_cpus_allowed(k->thread,CPU_MASK_CPU0); -+ //set_cpus_allowed(k->thread,CPU_MASK_CPU0); - #endif - return SUCCESS; - }