From d58fb3e02020943ac92b0597ad5f6a80157e99f0 Mon Sep 17 00:00:00 2001 From: TimofeyTitovets Date: Wed, 30 Apr 2014 13:40:15 +0300 Subject: [PATCH] small fixes in rt2x00dev.c fixed compiling warning *.sh added #!/bin/bash -e and changed 644 to 755 --- build.sh | 5 +++-- load.sh | 11 ++++++----- rt2x00dev.c | 42 +++++++++++++++++++++--------------------- run.sh | 7 ++----- unload.sh | 1 + 5 files changed, 33 insertions(+), 33 deletions(-) mode change 100644 => 100755 build.sh mode change 100644 => 100755 load.sh mode change 100644 => 100755 run.sh mode change 100644 => 100755 unload.sh diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 index bb16684..a0ac3c1 --- a/build.sh +++ b/build.sh @@ -1,2 +1,3 @@ -#make -C /home/ralink/7630/wireless-testing/ M=$PWD -make -C /lib/modules/3.5.0-24-generic/build/ M=$PWD +#!/bin/bash -e +kernel=`uname -r` +make -C /lib/modules/"$kernel"/build/ M=$PWD diff --git a/load.sh b/load.sh old mode 100644 new mode 100755 index 7caf145..ecfae28 --- a/load.sh +++ b/load.sh @@ -1,8 +1,9 @@ -insmod /lib/modules/3.5.0-24-generic/kernel/drivers/misc/eeprom/eeprom.ko -insmod /lib/modules/3.5.0-24-generic/kernel/drivers/misc/eeprom/eeprom_93cx6.ko -insmod /lib/modules/3.5.0-24-generic/kernel/lib/crc-ccitt.ko -insmod /lib/modules/3.5.0-24-generic/kernel/net/wireless/cfg80211.ko -insmod /lib/modules/3.5.0-24-generic/kernel/net/mac80211/mac80211.ko +#!/bin/bash -e +modprobe eeprom.ko +modprobe eeprom_93cx6.ko +modprobe crc-ccitt.ko +modprobe cfg80211.ko +modprobe mac80211.ko insmod ./rt2x00lib.ko; insmod ./rt2x00pci.ko; insmod ./rt2800lib.ko; diff --git a/rt2x00dev.c b/rt2x00dev.c index b3bb391..a2fc5de 100644 --- a/rt2x00dev.c +++ b/rt2x00dev.c @@ -64,11 +64,11 @@ static inline void rt2x00dev_pci_register_write(struct rt2x00_dev *rt2x00dev, u32 value) { #if 1 - if (((offset) >= 0x2000 & (offset) < 0x2a00)|| (offset) == 0x0500) - ; - else + if (((offset) >= 0x2000 && (offset) < 0x2a00)|| (offset) == 0x0500) + ; + else printk("rt2x00dev_pci_register_write 0x%x = 0x%x\n",(offset),(value)); -#endif +#endif writel(value, rt2x00dev->csr.base + offset); } @@ -98,10 +98,10 @@ EXPORT_SYMBOL_GPL(rt2x00lib_get_bssidx); int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev) { int status; + unsigned int i=0; + u32 reg; printk("===>%s\n",__FUNCTION__); - unsigned int i=0; - u32 reg; - + /* * Don't enable the radio twice. * And check if the hardware button has been disabled. @@ -1136,7 +1136,7 @@ rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev) status = rt2x00queue_alloc_rxskbs(rt2x00dev->rx); if (status) return status; - + set_bit(DEVICE_STATE_INITIALIZED, &rt2x00dev->flags); return 0; @@ -1194,7 +1194,7 @@ int rt2x00lib_start(struct rt2x00_dev *rt2x00dev) return -EINVAL; else printk("ASIC is ready\n"); - + if (rt2800_dev_wait_csr_ready(rt2x00dev)) return -EBUSY; rt2x00dev_pci_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000000); @@ -1402,7 +1402,7 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) tasklet_kill(&rt2x00dev->tx1damdone_tasklet); tasklet_kill(&rt2x00dev->tx2damdone_tasklet); tasklet_kill(&rt2x00dev->tx3damdone_tasklet); - + /* * Uninitialize device. @@ -1531,11 +1531,11 @@ void MT76x0_WLAN_ChipOnOff( { /* Restore all HW default value and reset RF. - */ + */ WlanFunCtrl.field.WLAN_RESET_MT7630 = 1; WlanFunCtrl.field.WLAN_RESET_RF_MT7630 = 1; printk("Reset(1) WlanFunCtrl.word = 0x%x\n", WlanFunCtrl.word); - rt2x00dev_pci_register_write(rt2x00dev, WLAN_FUN_CTRL, WlanFunCtrl.word); + rt2x00dev_pci_register_write(rt2x00dev, WLAN_FUN_CTRL, WlanFunCtrl.word); udelay(50); WlanFunCtrl.field.WLAN_RESET_MT7630 = 0; WlanFunCtrl.field.WLAN_RESET_RF_MT7630 = 0; @@ -1550,7 +1550,7 @@ void MT76x0_WLAN_ChipOnOff( /* Enable WLAN function and clock WLAN_FUN_CTRL[1:0] = 0x3 - */ + */ WlanFunCtrl.field.WLAN_CLK_EN_MT7630 = 1; WlanFunCtrl.field.WLAN_EN_MT7630 = 1; } @@ -1566,7 +1566,7 @@ void MT76x0_WLAN_ChipOnOff( } printk("WlanFunCtrl.word = 0x%x\n", WlanFunCtrl.word); - rt2x00dev_pci_register_write(rt2x00dev, WLAN_FUN_CTRL, WlanFunCtrl.word); + rt2x00dev_pci_register_write(rt2x00dev, WLAN_FUN_CTRL, WlanFunCtrl.word); udelay(50); if (bOn) @@ -1577,14 +1577,14 @@ void MT76x0_WLAN_ChipOnOff( if (bOn == 1) { - unsigned int index = 0; + unsigned int index = 0; CMB_CTRL_STRUC CmbCtrl; - + CmbCtrl.word = 0; - + do { - do + do { rt2x00dev_pci_register_read(rt2x00dev, CMB_CTRL, &CmbCtrl.word); @@ -1621,7 +1621,7 @@ void MT76x0_WLAN_ChipOnOff( { break; } - } + } while (1); @@ -1630,7 +1630,7 @@ void MT76x0_WLAN_ChipOnOff( CmbCtrl.field.AUX_OPT_Bit14_TRSW1_as_GPIO=1; CmbCtrl.field.AUX_OPT_Bit11_Rsv=1; rt2x00dev_pci_register_write(rt2x00dev, CMB_CTRL, CmbCtrl.word); - + } g_WlanFunCtrl.word = WlanFunCtrl.word; @@ -1658,7 +1658,7 @@ int WaitForAsicReady(struct rt2x00_dev *rt2x00dev) printk("%s(0x%x):AsicNotReady!\n", __FUNCTION__, mac_val); - + return 0; } diff --git a/run.sh b/run.sh old mode 100644 new mode 100755 index 5a50b79..338ed70 --- a/run.sh +++ b/run.sh @@ -1,9 +1,6 @@ #!/bin/bash -while : -do - +while : do iwlist wlan11 sc - sleep 15 - + sleep 15 done diff --git a/unload.sh b/unload.sh old mode 100644 new mode 100755 index 745c60e..5144d48 --- a/unload.sh +++ b/unload.sh @@ -1,3 +1,4 @@ +#!/bin/bash -e rmmod rt2800pci.ko; rmmod rt2800lib.ko; rmmod rt2x00pci.ko;