Merge pull request #13 from olerem/buildfixes

Buildfixes part4v2

diff --git a/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c b/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c
index 8a206aab27dcdb8525ee8785a6df95ae18baa6fd..1068ce24f20235b26dbeb5542f7ed1cf824849c7 100755 (executable)
--- a/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c
+++ b/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c
@@ -231,10 +231,10 @@ uint16_t db_get_cmd_line(uint8_t ch, char *cmd_line, uint16_t* i)
                        }
                }
 
-               if(strlen(cmd_buffer[cmd_buf_loc]) != 0)
+               if (A_STRLEN(cmd_buffer[cmd_buf_loc]) != 0)
                {
-                       strcpy(cmd_line, cmd_buffer[cmd_buf_loc]);
-                       *i = strlen(cmd_buffer[cmd_buf_loc]);
+                       A_STRCPY(cmd_line, cmd_buffer[cmd_buf_loc]);
+                       *i = A_STRLEN(cmd_buffer[cmd_buf_loc]);
                        zm_uart_send("\r>", 2);
                        zm_uart_send(cmd_line, *i);
                }
@@ -248,7 +248,7 @@ uint16_t db_get_cmd_line(uint8_t ch, char *cmd_line, uint16_t* i)
                        //Filter duplicated string in command history
                        if (strcmp(cmd_buffer[(cmd_buf_ptr==0)?(COMMAND_BUFFER_SIZE-1):(cmd_buf_ptr-1)], cmd_line) != 0)
                        {
-                               strcpy(cmd_buffer[cmd_buf_ptr++], cmd_line);
+                               A_STRCPY(cmd_buffer[cmd_buf_ptr++], cmd_line);
                        }
                }
                if (cmd_buf_ptr >= COMMAND_BUFFER_SIZE)
@@ -329,7 +329,7 @@ int db_formalize_command(char* raw_str,  char* cmd_str)
                }
                cmd_str[k*DB_MAX_COMMAND_LENGTH + j] = 0;
        }
-       return (int)strlen(cmd_str);
+       return (int)A_STRLEN(cmd_str);
 }
 
 int db_ascii_to_hex(char* num_str, unsigned long* hex_num)
@@ -411,14 +411,18 @@ int db_help_cmd(char* cmd, char* param1, char* param2, char* param3)
 
        i = 0;
 
-       zm_uart_send(ATH_DEBUGGER_VERSION_STR, strlen(ATH_DEBUGGER_VERSION_STR));
-       zm_uart_send(ATH_COMMAND_LIST_STR, strlen(ATH_COMMAND_LIST_STR));
+       zm_uart_send(ATH_DEBUGGER_VERSION_STR,
+                    A_STRLEN(ATH_DEBUGGER_VERSION_STR));
+       zm_uart_send(ATH_COMMAND_LIST_STR,
+                    A_STRLEN(ATH_COMMAND_LIST_STR));
 
        while (command_table[i].cmd_func)
        {
-               zm_uart_send(command_table[i].cmd_str, strlen(command_table[i].cmd_str));
+               zm_uart_send(command_table[i].cmd_str,
+                            A_STRLEN(command_table[i].cmd_str));
                zm_uart_send("\t", 1);
-               zm_uart_send(command_table[i].help_str, strlen(command_table[i].help_str));
+               zm_uart_send(command_table[i].help_str,
+                            A_STRLEN(command_table[i].help_str));
                zm_uart_send("\n\r", 2);
                i++;
        }
@@ -458,9 +462,9 @@ int db_ldr_cmd(char* cmd, char* param1, char* param2, char* param3)
                db_hex_to_ascii(val, val_str);
                db_hex_to_ascii(addr, addr_str);
 
-               zm_uart_send(addr_str, strlen(addr_str));
+               zm_uart_send(addr_str, A_STRLEN(addr_str));
                zm_uart_send(" : ", 3);
-               zm_uart_send(val_str, strlen(val_str));
+               zm_uart_send(val_str, A_STRLEN(val_str));
                zm_uart_send("\n\r", 2);
 
                return 0;
@@ -480,7 +484,7 @@ int db_str_cmd(char* cmd, char* param1, char* param2, char* param3)
        char val_str[20];
        char addr_str[20];
 
-       if ((strlen(param2) > 0) &&
+       if ((A_STRLEN(param2) > 0) &&
            (db_ascii_to_hex(param1, &addr) != -1) &&
            (db_ascii_to_hex(param2, &val) != -1))
        {
@@ -510,9 +514,9 @@ int db_str_cmd(char* cmd, char* param1, char* param2, char* param3)
                db_hex_to_ascii(val, val_str);
                db_hex_to_ascii(addr, addr_str);
 
-               zm_uart_send(addr_str, strlen(addr_str));
+               zm_uart_send(addr_str, A_STRLEN(addr_str));
                zm_uart_send(" : ", 3);
-               zm_uart_send(val_str, strlen(val_str));
+               zm_uart_send(val_str, A_STRLEN(val_str));
                zm_uart_send("\n\r", 2);
 
                return 0;
@@ -609,12 +613,6 @@ int db_patch_cmd(char* cmd, char* param1, char* param2, char* param3)
 
 uint32_t delay = 0;
 
-LOCAL void cb_tick()
-{
-       ;    
-}
-
-
 int db_intr_cmd(char* cmd, char* param1, char* param2, char* param3)
 {
 #if SYSTEM_MODULE_INTR
@@ -637,8 +635,7 @@ int db_intr_cmd(char* cmd, char* param1, char* param2, char* param3)
 
                if (strcmp(param2, "on") == 0 )
                {
-                       A_ATTACH_ISR(A_INUM_XTTIMER, cb_tick, NULL);
-
+                       /* TODO: this part is probably dead. */
                        pending_intrs = A_INTR_GET_INTRENABLE()|CMNOS_IMASK_XTTIMER;
                        A_INTR_SET_INTRENABLE(pending_intrs);
                        A_PRINTF("- intr [0x%08x]\n\r", pending_intrs);
@@ -742,7 +739,8 @@ int db_info_cmd(char* cmd, char* param1, char* param2, char* param3)
        {
                A_ALLOCRAM_DEBUG();
        }
-#if SYSTEM_MODULE_SYS_MONITOR
+#if 0  /* TODO: SYSTEM_MODULE_SYS_MONITOR depends on _ROM_ or _RAM_ which
+       * is dead too */
        else if(strcmp(param1, "cpu") == 0)
                zfPrintCpuUtilization();
 #endif

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index baf1ae6017d3bb24abfee8d5a6d49f49827ef762..b8874bf00ec66fb500137bdda3b83618e6630813 100755 (executable)
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -1136,7 +1136,6 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
 {
        struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
        struct ath_hal *ah = sc->sc_ah;
-       a_uint32_t stbcsupport;
 
        sc->sc_imask = HAL_INT_RX | HAL_INT_TX
                | HAL_INT_RXEOL | HAL_INT_RXORN
@@ -1148,11 +1147,14 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
                sc->sc_imask |= HAL_INT_CST;
 
 #ifdef MAGPIE_MERLIN
-       if (ath_hal_txstbcsupport(ah, &stbcsupport))
-               sc->sc_txstbcsupport = stbcsupport;
+       {
+               a_uint32_t stbcsupport;
+               if (ath_hal_txstbcsupport(ah, &stbcsupport))
+                       sc->sc_txstbcsupport = stbcsupport;
 
-       if (ath_hal_rxstbcsupport(ah, &stbcsupport))
-               sc->sc_rxstbcsupport = stbcsupport;
+               if (ath_hal_rxstbcsupport(ah, &stbcsupport))
+                       sc->sc_rxstbcsupport = stbcsupport;
+       }
 #endif
        adf_os_setup_intr(sc->sc_dev, ath_intr);
        ath_hal_intrset(ah, sc->sc_imask);

diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index 7c83da11769ba58d01954d559ab2e267aaaabb3d..40721cde3785ae3982a5fb1e499ac44b5c4afed1 100755 (executable)
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -2089,7 +2089,7 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
 
        __stats(sc, tx_bars);
 
-       memset(&series, 0, sizeof(series));
+       adf_os_mem_set(&series, 0, sizeof(series));
 
        ath_aggr_pause_tid(sc, tid);
 

diff --git a/target_firmware/wlan/ratectrl_11n_ln.c b/target_firmware/wlan/ratectrl_11n_ln.c
index 5e123764c4f3f8194b8df1a768c78d7236b477dc..de8655016d2761327c8b6c63b7771795d40a38a6 100755 (executable)
--- a/target_firmware/wlan/ratectrl_11n_ln.c
+++ b/target_firmware/wlan/ratectrl_11n_ln.c
@@ -246,14 +246,14 @@ rcSibSetValidRates(const RATE_TABLE_11N *pRateTable,
        A_UINT8 i, j, hi = 0;
        A_UINT8 singleStream = (capflag & WLAN_RC_DS_FLAG) ? 0 : 1;
        A_UINT32 valid;
-       struct atheros_node *pSib = ATH_NODE_ATHEROS(an);
        
        /* Use intersection of working rates and valid rates */
        for (i = 0; i < pRateSet->rs_nrates; i++) {
                for (j = 0; j < pRateTable->rateCount; j++) {
                        A_UINT32 phy = pRateTable->info[j].phy;
-
 #ifdef MAGPIE_MERLIN
+                       struct atheros_node *pSib = ATH_NODE_ATHEROS(an);
+
                        if (pSib->stbc) {
                                valid = pRateTable->info[j].validSTBC;
                        } else if (singleStream) {
@@ -300,14 +300,14 @@ rcSibSetValidHtRates(const RATE_TABLE_11N *pRateTable,
        A_UINT8 i, j, hi = 0;
        A_UINT8 singleStream = (capflag & WLAN_RC_DS_FLAG) ? 0 : 1;
        A_UINT8 valid;
-       struct atheros_node *pSib = ATH_NODE_ATHEROS(an);
     
        /* Use intersection of working rates and valid rates */
        for (i = 0; i <  ((struct ieee80211_rateset *)pMcsSet)->rs_nrates; i++) {
                for (j = 0; j < pRateTable->rateCount; j++) {
                        A_UINT32 phy = pRateTable->info[j].phy;
-
 #ifdef MAGPIE_MERLIN
+                       struct atheros_node *pSib = ATH_NODE_ATHEROS(an);
+
                        if (pSib->stbc) {
                                valid = pRateTable->info[j].validSTBC;
                        } else if (singleStream) {
@@ -1161,7 +1161,7 @@ ath_rate_newstate(struct ath_softc_tgt *sc,
        struct atheros_softc *asc = (struct atheros_softc *) sc->sc_rc;
 
        asc->tx_chainmask = sc->sc_ic.ic_tx_chainmask;
-       ath_rate_newassoc(sc, ni, 1, capflag, rs);    
+       ath_rate_newassoc(sc, ATH_NODE_TARGET(ni), 1, capflag, rs);
 }
 
 static void