diff options
Diffstat (limited to 'xpp/xproto.c')
| -rw-r--r-- | xpp/xproto.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/xpp/xproto.c b/xpp/xproto.c index 4796ed3..c512479 100644 --- a/xpp/xproto.c +++ b/xpp/xproto.c @@ -55,7 +55,7 @@ const xproto_entry_t *xproto_card_entry(const xproto_table_t *table, byte opcode { const xproto_entry_t *xe; - //DBG("\n"); + //DBG(GENERAL, "\n"); xe = &table->entries[opcode]; return (xe->handler != NULL) ? xe : NULL; } @@ -65,7 +65,7 @@ const xproto_entry_t *xproto_global_entry(byte opcode) const xproto_entry_t *xe; xe = xproto_card_entry(&PROTO_TABLE(GLOBAL), opcode); - //DBG("opcode=0x%X xe=%p\n", opcode, xe); + //DBG(GENERAL, "opcode=0x%X xe=%p\n", opcode, xe); return xe; } @@ -99,7 +99,7 @@ const xproto_table_t *xproto_get(xpd_type_t cardtype) } if(xtable) { BUG_ON(!xtable->owner); - DBG("%s refcount was %d\n", xtable->name, module_refcount(xtable->owner)); + DBG(GENERAL, "%s refcount was %d\n", xtable->name, module_refcount(xtable->owner)); if(!try_module_get(xtable->owner)) { ERR("%s: try_module_get for %s failed.\n", __FUNCTION__, xtable->name); return NULL; @@ -111,7 +111,7 @@ const xproto_table_t *xproto_get(xpd_type_t cardtype) void xproto_put(const xproto_table_t *xtable) { BUG_ON(!xtable); - DBG("%s refcount was %d\n", xtable->name, module_refcount(xtable->owner)); + DBG(GENERAL, "%s refcount was %d\n", xtable->name, module_refcount(xtable->owner)); BUG_ON(module_refcount(xtable->owner) <= 0); module_put(xtable->owner); } @@ -120,7 +120,7 @@ xproto_handler_t xproto_card_handler(const xproto_table_t *table, byte opcode) { const xproto_entry_t *xe; - //DBG("\n"); + //DBG(GENERAL, "\n"); xe = xproto_card_entry(table, opcode); return xe->handler; } @@ -237,11 +237,11 @@ int xframe_receive(xbus_t *xbus, xframe_t *xframe) len = pack->datalen; /* Sanity checks */ if(unlikely(is_pcm && pack->opcode != XPROTO_NAME(GLOBAL,PCM_READ) && printk_ratelimit())) { - XBUS_DBG(xbus, "Non-PCM packet within a PCM xframe\n"); + XBUS_DBG(GENERAL, xbus, "Non-PCM packet within a PCM xframe\n"); dump_xframe("In PCM xframe", xbus, xframe); // goto bad_proto; } else if(unlikely(!is_pcm && pack->opcode == XPROTO_NAME(GLOBAL,PCM_READ) && printk_ratelimit())) { - XBUS_DBG(xbus, "A PCM packet within a Non-PCM xframe\n"); + XBUS_DBG(GENERAL, xbus, "A PCM packet within a Non-PCM xframe\n"); // goto bad_proto; } p += len; @@ -278,7 +278,7 @@ void dump_packet(const char *msg, xpacket_t *packet, bool print_dbg) if(!print_dbg) return; - DBG("%s: XPD=%1X-%1X (0x%X) OP=0x%02X LEN=%d", + DBG(GENERAL, "%s: XPD=%1X-%1X (0x%X) OP=0x%02X LEN=%d", msg, packet->addr.unit, packet->addr.subunit, @@ -297,8 +297,8 @@ void dump_packet(const char *msg, xpacket_t *packet, bool print_dbg) if(i >= sizeof(xpacket_t)) { if(limiter < ERR_REPORT_LIMIT) { - ERR("%s: length overflow i=%d > sizeof(xpacket_t)=%d\n", - __FUNCTION__, i+1, sizeof(xpacket_t)); + ERR("%s: length overflow i=%d > sizeof(xpacket_t)=%lu\n", + __FUNCTION__, i+1, (long)sizeof(xpacket_t)); } else if(limiter == ERR_REPORT_LIMIT) { ERR("%s: error packet #%d... squelsh reports.\n", __FUNCTION__, limiter); @@ -328,20 +328,20 @@ void dump_reg_cmd(const char msg[], const reg_cmd_t *regcmd, bool writing) action = (writing) ? 'W' : 'R'; chipsel = REG_FIELD(regcmd, chipsel) & ~0x80; if(REG_FIELD(regcmd, do_subreg)) { - DBG("%s: %d %cS %02X %02X [%02X] # data_high=%X m=%d eof=%d\n", msg, chipsel, action, + DBG(GENERAL, "%s: %d %cS %02X %02X [%02X] # data_high=%X m=%d eof=%d\n", msg, chipsel, action, REG_FIELD(regcmd, regnum), REG_FIELD(regcmd, subreg), REG_FIELD(regcmd, data_low), REG_FIELD(regcmd, data_high), regcmd->multibyte, regcmd->eoframe); } else if(REG_FIELD(regcmd, regnum) == 0x1E) { - DBG("%s: %d %cI %02X [%02X %02X] # m=%d eof=%d\n", msg, chipsel, action, + DBG(GENERAL, "%s: %d %cI %02X [%02X %02X] # m=%d eof=%d\n", msg, chipsel, action, REG_FIELD(regcmd, subreg), REG_FIELD(regcmd, data_low), REG_FIELD(regcmd, data_high), regcmd->multibyte, regcmd->eoframe); } else { - DBG("%s: %d %cD %02X [%02X] # data_high=%X m=%d eof=%d\n", msg, chipsel, action, + DBG(GENERAL, "%s: %d %cD %02X [%02X] # data_high=%X m=%d eof=%d\n", msg, chipsel, action, REG_FIELD(regcmd, regnum), REG_FIELD(regcmd, data_low), REG_FIELD(regcmd, data_high), @@ -379,7 +379,7 @@ int xproto_register(const xproto_table_t *proto_table) NOTICE("%s: Bad xproto type %d\n", __FUNCTION__, type); return -EINVAL; } - DBG("%s (%d)\n", name, type); + DBG(GENERAL, "%s (%d)\n", name, type); if(xprotocol_tables[type]) NOTICE("%s: overriding registration of %s (%d)\n", __FUNCTION__, name, type); xops = &proto_table->xops; @@ -409,7 +409,7 @@ void xproto_unregister(const xproto_table_t *proto_table) BUG_ON(!proto_table); type = proto_table->type; name = proto_table->name; - DBG("%s (%d)\n", name, type); + DBG(GENERAL, "%s (%d)\n", name, type); if(type >= XPD_TYPE_NOMODULE) { NOTICE("%s: Bad xproto type %s (%d)\n", __FUNCTION__, name, type); return; |