}
}
- 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);
}
//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)
}
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)
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++;
}
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;
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))
{
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;
uint32_t delay = 0;
-LOCAL void cb_tick()
-{
- ;
-}
-
-
int db_intr_cmd(char* cmd, char* param1, char* param2, char* param3)
{
#if SYSTEM_MODULE_INTR
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);
{
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
{
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
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);
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) {
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) {
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