API tools faq
paste
Guest User

Untitled

a guest
Dec 27th, 2014
682
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 11.22 KB | None | 0 0
raw download clone embed print report
  1. Binary files /home/kris/Downloads/rtl8812au/.git/index and rtl8812au/.git/index differ
  2. diff -rup /home/kris/Downloads/rtl8812au/.git/logs/HEAD rtl8812au/.git/logs/HEAD
  3. --- /home/kris/Downloads/rtl8812au/.git/logs/HEAD   2014-12-23 13:46:30.025548476 +0100
  4. +++ rtl8812au/.git/logs/HEAD    2014-12-25 16:02:46.605622640 +0100
  5. @@ -1 +1 @@
  6. -0000000000000000000000000000000000000000 a53c4ece2757c54515d603206046abd1fe88f240 Kristijan Vrban <[email protected]> 1419338790 +0100    clone: from https://github.com/gnab/rtl8812au.git
  7. +0000000000000000000000000000000000000000 a53c4ece2757c54515d603206046abd1fe88f240 Kristijan Vrban <[email protected]> 1419519728 +0100    clone: from https://github.com/gnab/rtl8812au.git
  8. diff -rup /home/kris/Downloads/rtl8812au/.git/logs/refs/heads/master rtl8812au/.git/logs/refs/heads/master
  9. --- /home/kris/Downloads/rtl8812au/.git/logs/refs/heads/master  2014-12-23 13:46:30.025548476 +0100
  10. +++ rtl8812au/.git/logs/refs/heads/master   2014-12-25 16:02:46.605622640 +0100
  11. @@ -1 +1 @@
  12. -0000000000000000000000000000000000000000 a53c4ece2757c54515d603206046abd1fe88f240 Kristijan Vrban <[email protected]> 1419338790 +0100    clone: from https://github.com/gnab/rtl8812au.git
  13. +0000000000000000000000000000000000000000 a53c4ece2757c54515d603206046abd1fe88f240 Kristijan Vrban <[email protected]> 1419519728 +0100    clone: from https://github.com/gnab/rtl8812au.git
  14. diff -rup /home/kris/Downloads/rtl8812au/Kconfig rtl8812au/Kconfig
  15. --- /home/kris/Downloads/rtl8812au/Kconfig  2014-12-23 13:46:30.241548476 +0100
  16. +++ rtl8812au/Kconfig   2014-12-25 16:07:50.229623352 +0100
  17. @@ -1,4 +1,4 @@
  18. -config RTL8821AU
  19. +config RTL8812AU_8821AU
  20.     tristate "Realtek 8821 USB WiFi"
  21.     depends on USB
  22.     ---help---
  23. diff -rup /home/kris/Downloads/rtl8812au/Makefile rtl8812au/Makefile
  24. --- /home/kris/Downloads/rtl8812au/Makefile 2014-12-23 13:46:30.241548476 +0100
  25. +++ rtl8812au/Makefile  2014-12-25 18:46:41.917645715 +0100
  26. @@ -49,7 +49,7 @@ CONFIG_EXT_CLK = n
  27.  CONFIG_FTP_PROTECT = n
  28.  CONFIG_WOWLAN = n
  29.  
  30. -CONFIG_PLATFORM_I386_PC = y
  31. +CONFIG_PLATFORM_I386_PC = n
  32.  CONFIG_PLATFORM_ANDROID_X86 = n
  33.  CONFIG_PLATFORM_JB_X86 = n
  34.  CONFIG_PLATFORM_ARM_S3C2K4 = n
  35. @@ -79,8 +79,7 @@ CONFIG_PLATFORM_DMP_PHILIPS = n
  36.  CONFIG_PLATFORM_TI_DM365 = n
  37.  CONFIG_PLATFORM_MSTAR_TITANIA12 = n
  38.  CONFIG_PLATFORM_SZEBOOK = n
  39. -CONFIG_PLATFORM_ARM_SUNxI = n
  40. -CONFIG_PLATFORM_ARM_SUN6I = n
  41. +CONFIG_PLATFORM_ARM_SUNxI = y
  42.  CONFIG_PLATFORM_ACTIONS_ATM702X = n
  43.  CONFIG_PLATFORM_ACTIONS_ATV5201 = n
  44.  
  45. @@ -941,21 +940,20 @@ endif
  46.  
  47.  
  48.  ifeq ($(CONFIG_PLATFORM_ARM_SUNxI), y)
  49. -EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ARM_SUNxI
  50. -ARCH := arm
  51. -CROSS_COMPILE := arm-none-linux-gnueabi-
  52. -KVER  := 3.0.8
  53. -#KSRC:= ../lichee/linux-3.0/
  54. -endif
  55. -
  56. -ifeq ($(CONFIG_PLATFORM_ARM_SUN6I), y)
  57. +$(warning >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> SUNxI for 8723)
  58.  EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
  59. -EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN6I
  60. +EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUNxI
  61. +ifeq ($(CONFIG_USB_HCI), y)
  62.  EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
  63. +endif
  64. +ifeq ($(CONFIG_SDIO_HCI), y)
  65. +EXTRA_CFLAGS += -DCONFIG_DETECT_CPWM_AND_C2H_BY_POLLING
  66. +endif
  67. +EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT
  68.  # default setting for Android 4.1, 4.2
  69.  EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
  70.  EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
  71. -EXTRA_CFLAGS += -DCONFIG_P2P_IPS
  72. +EXTRA_CFLAGS += -DCONFIG_P2P_IPS -DCONFIG_QOS_OPTIMIZATION
  73.  ARCH := arm
  74.  CROSS_COMPILE := arm-none-linux-gnueabi-
  75.  KVER  := 3.3.0
  76. diff -rup /home/kris/Downloads/rtl8812au/os_dep/linux/os_intfs.c rtl8812au/os_dep/linux/os_intfs.c
  77. --- /home/kris/Downloads/rtl8812au/os_dep/linux/os_intfs.c  2014-12-23 13:46:30.309548477 +0100
  78. +++ rtl8812au/os_dep/linux/os_intfs.c   2014-12-25 18:59:10.285647473 +0100
  79. @@ -434,19 +434,21 @@ void rtw_proc_init_one(struct net_device
  80.  
  81.     rtw_proc_cnt++;
  82.  
  83. -   entry = create_proc_read_write_entry("write_reg", S_IFREG | S_IRUGO,
  84. -                  dir_dev, proc_get_write_reg, dev, proc_set_write_reg);
  85. -   if (!entry) {
  86. -       DBG_871X("Unable to create_proc_read_entry!\n");
  87. -       return;
  88. -   }
  89. -
  90. -   entry = create_proc_read_write_entry("read_reg", S_IFREG | S_IRUGO,
  91. -                  dir_dev, proc_get_read_reg, dev, proc_set_read_reg);
  92. -   if (!entry) {
  93. -       DBG_871X("Unable to create_proc_read_entry!\n");
  94. -       return;
  95. -   }
  96. +        entry = create_proc_read_entry("write_reg", S_IFREG | S_IRUGO,
  97. +                                   dir_dev, proc_get_write_reg, dev);
  98. +        if (!entry) {
  99. +                DBG_871X("Unable to create_proc_read_entry!\n");
  100. +                return;
  101. +        }
  102. +        entry->write_proc = proc_set_write_reg;
  103. +
  104. +        entry = create_proc_read_entry("read_reg", S_IFREG | S_IRUGO,
  105. +                                   dir_dev, proc_get_read_reg, dev);
  106. +        if (!entry) {
  107. +                DBG_871X("Unable to create_proc_read_entry!\n");
  108. +                return;
  109. +        }
  110. +        entry->write_proc = proc_set_read_reg;
  111.  
  112.     entry = create_proc_read_entry("fwstate", S_IFREG | S_IRUGO,
  113.                    dir_dev, proc_get_fwstate, dev);
  114. @@ -612,64 +614,72 @@ void rtw_proc_init_one(struct net_device
  115.     }
  116.  #endif
  117.  
  118. -   entry = create_proc_read_write_entry("rx_signal", S_IFREG | S_IRUGO,
  119. -                  dir_dev, proc_get_rx_signal, dev, proc_set_rx_signal);
  120. +   entry = create_proc_read_entry("rx_signal", S_IFREG | S_IRUGO,
  121. +                  dir_dev, proc_get_rx_signal, dev);
  122.     if (!entry) {
  123.         DBG_871X("Unable to create_proc_read_entry!\n");
  124.         return;
  125.     }
  126. +   entry->write_proc = proc_set_rx_signal;
  127.  #ifdef CONFIG_80211N_HT
  128. -   entry = create_proc_read_write_entry("ht_enable", S_IFREG | S_IRUGO,
  129. -                  dir_dev, proc_get_ht_enable, dev, proc_set_ht_enable);
  130. +   entry = create_proc_read_entry("ht_enable", S_IFREG | S_IRUGO,
  131. +                  dir_dev, proc_get_ht_enable, dev);
  132.     if (!entry) {
  133.         DBG_871X("Unable to create_proc_read_entry!\n");
  134.         return;
  135.     }
  136. +   entry->write_proc = proc_set_ht_enable;
  137.  
  138. -   entry = create_proc_read_write_entry("bw_mode", S_IFREG | S_IRUGO,
  139. -                  dir_dev, proc_get_bw_mode, dev, proc_set_bw_mode);
  140. +   entry = create_proc_read_entry("bw_mode", S_IFREG | S_IRUGO,
  141. +                  dir_dev, proc_get_bw_mode, dev);
  142.     if (!entry) {
  143.         DBG_871X("Unable to create_proc_read_entry!\n");
  144.         return;
  145.     }
  146. +   entry->write_proc = proc_set_bw_mode;
  147.  
  148. -   entry = create_proc_read_write_entry("ampdu_enable", S_IFREG | S_IRUGO,
  149. -                  dir_dev, proc_get_ampdu_enable, dev, proc_set_ampdu_enable);
  150. +   entry = create_proc_read_entry("ampdu_enable", S_IFREG | S_IRUGO,
  151. +                  dir_dev, proc_get_ampdu_enable, dev);
  152.     if (!entry) {
  153.         DBG_871X("Unable to create_proc_read_entry!\n");
  154.         return;
  155.     }
  156. +   entry->write_proc = proc_set_ampdu_enable;
  157.  
  158. -   entry = create_proc_read_write_entry("rx_stbc", S_IFREG | S_IRUGO,
  159. -                  dir_dev, proc_get_rx_stbc, dev, proc_set_rx_stbc);
  160. +   entry = create_proc_read_entry("rx_stbc", S_IFREG | S_IRUGO,
  161. +                  dir_dev, proc_get_rx_stbc, dev);
  162.     if (!entry) {
  163.         DBG_871X("Unable to create_proc_read_entry!\n");
  164.         return;
  165.     }
  166. +   entry->write_proc = proc_set_rx_stbc;
  167.  #endif //CONFIG_80211N_HT
  168.  
  169.     entry = create_proc_read_entry("path_rssi", S_IFREG | S_IRUGO,
  170.                     dir_dev, proc_get_two_path_rssi, dev);
  171.  
  172. -   entry = create_proc_read_write_entry("rssi_disp", S_IFREG | S_IRUGO,
  173. -                  dir_dev, proc_get_rssi_disp, dev, proc_set_rssi_disp);
  174. -   if (!entry) {
  175. +   entry = create_proc_read_entry("rssi_disp", S_IFREG | S_IRUGO,
  176. +                  dir_dev, proc_get_rssi_disp, dev);
  177. +
  178. +        if (!entry) {
  179.         DBG_871X("Unable to create_proc_read_entry!\n");
  180.         return;
  181.     }
  182.  #ifdef CONFIG_BT_COEXIST
  183. -   entry = create_proc_read_write_entry("btcoex_dbg", S_IFREG | S_IRUGO,
  184. -                  dir_dev, proc_get_btcoex_dbg, dev, proc_set_btcoex_dbg);
  185. -   if (!entry) {
  186. +   entry = create_proc_read_entry("btcoex_dbg", S_IFREG | S_IRUGO,
  187. +                  dir_dev, proc_get_btcoex_dbg, dev);
  188. +
  189. +        if (!entry) {
  190.         DBG_871X("Unable to create_proc_read_entry!\n");
  191.         return;
  192.     }
  193.  #endif /*CONFIG_BT_COEXIST*/
  194.  
  195.  #if defined(DBG_CONFIG_ERROR_DETECT)
  196. -   entry = create_proc_read_write_entry("sreset", S_IFREG | S_IRUGO,
  197. -                  dir_dev, proc_get_sreset, dev, proc_set_sreset);
  198. -   if (!entry) {
  199. +   entry = create_proc_read_entry("sreset", S_IFREG | S_IRUGO,
  200. +                  dir_dev, proc_get_sreset, dev);
  201. +
  202. +        if (!entry) {
  203.         DBG_871X("Unable to create_proc_read_entry!\n");
  204.         return;
  205.     }
  206. Only in rtl8812au/os_dep/linux: os_intfs.c~
  207. diff -rup /home/kris/Downloads/rtl8812au/os_dep/linux/usb_intf.c rtl8812au/os_dep/linux/usb_intf.c
  208. --- /home/kris/Downloads/rtl8812au/os_dep/linux/usb_intf.c  2014-12-23 13:46:30.309548477 +0100
  209. +++ rtl8812au/os_dep/linux/usb_intf.c   2014-12-25 18:56:15.013647063 +0100
  210. @@ -1417,13 +1417,6 @@ extern void rtd2885_wlan_netlink_sendMsg
  211.  #include <mach/sys_config.h>
  212.  extern int sw_usb_disable_hcd(__u32 usbc_no);
  213.  extern int sw_usb_enable_hcd(__u32 usbc_no);
  214. -static int usb_wifi_host = 2;
  215. -#endif
  216. -
  217. -#ifdef CONFIG_PLATFORM_ARM_SUN6I
  218. -#include <mach/sys_config.h>
  219. -extern int sw_usb_disable_hcd(__u32 usbc_no);
  220. -extern int sw_usb_enable_hcd(__u32 usbc_no);
  221.  extern void wifi_pm_power(int on);
  222.  static script_item_u item;
  223.  #endif
  224. @@ -1963,34 +1956,21 @@ static int __init rtw_drv_entry(void)
  225.  #endif
  226.  #ifdef CONFIG_PLATFORM_ARM_SUNxI
  227.  #ifndef CONFIG_RTL8723A
  228. -   int ret = 0;
  229. -   /* ----------get usb_wifi_usbc_num------------- */
  230. -   ret = script_parser_fetch("usb_wifi_para", "usb_wifi_usbc_num", (int *)&usb_wifi_host, 64);
  231. -   if(ret != 0){
  232. -       DBG_8192C("ERR: script_parser_fetch usb_wifi_usbc_num failed\n");
  233. -       ret = -ENOMEM;
  234. -       return ret;
  235. -   }
  236. -   DBG_8192C("sw_usb_enable_hcd: usbc_num = %d\n", usb_wifi_host);
  237. -   sw_usb_enable_hcd(usb_wifi_host);
  238. +        script_item_value_type_e type;
  239. +
  240. +        type = script_get_item("wifi_para", "wifi_usbc_id", &item);
  241. +        if(SCIRPT_ITEM_VALUE_TYPE_INT != type){
  242. +                printk("ERR: script_get_item wifi_usbc_id failed\n");
  243. +                return -ENOMEM;
  244. +        }
  245. +
  246. +        printk("sw_usb_enable_hcd: usbc_num = %d\n", item.val);
  247. +        wifi_pm_power(1);
  248. +        mdelay(10);
  249. +        //sw_usb_enable_hcd(item.val);
  250.  #endif //CONFIG_RTL8723A
  251.  #endif //CONFIG_PLATFORM_ARM_SUNxI
  252.  
  253. -#ifdef CONFIG_PLATFORM_ARM_SUN6I
  254. -   script_item_value_type_e type;
  255. -
  256. -   type = script_get_item("wifi_para", "wifi_usbc_id", &item);
  257. -   if(SCIRPT_ITEM_VALUE_TYPE_INT != type){
  258. -       printk("ERR: script_get_item wifi_usbc_id failed\n");
  259. -       return -ENOMEM;
  260. -   }
  261. -
  262. -   printk("sw_usb_enable_hcd: usbc_num = %d\n", item.val);
  263. -   wifi_pm_power(1);
  264. -   mdelay(10);
  265. -   sw_usb_enable_hcd(item.val);
  266. -#endif //CONFIG_PLATFORM_ARM_SUN6I
  267. -
  268.     RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n"));
  269.  
  270.     DBG_871X(DRV_NAME " driver version=%s\n", DRIVERVERSION);
  271. @@ -2017,14 +1997,14 @@ static void __exit rtw_drv_halt(void)
  272.  
  273.  #ifdef CONFIG_PLATFORM_ARM_SUNxI
  274.  #ifndef CONFIG_RTL8723A
  275. -   DBG_8192C("sw_usb_disable_hcd: usbc_num = %d\n", usb_wifi_host);
  276. -   sw_usb_disable_hcd(usb_wifi_host);
  277. +   //DBG_8192C("sw_usb_disable_hcd: usbc_num = %d\n", usb_wifi_host);
  278. +   //sw_usb_disable_hcd(usb_wifi_host);
  279.  #endif //ifndef CONFIG_RTL8723A
  280.  #endif //CONFIG_PLATFORM_ARM_SUNxI
  281.  
  282. -#ifdef CONFIG_PLATFORM_ARM_SUN6I
  283. -   sw_usb_disable_hcd(item.val);
  284. -   wifi_pm_power(0);
  285. +#ifdef CONFIG_PLATFORM_ARM_SUNxI
  286. +   //sw_usb_disable_hcd(item.val);
  287. +        wifi_pm_power(0);
  288.  #endif
  289.  
  290.     DBG_871X("-rtw_drv_halt\n");
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!