X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fmac%2Ftkn154%2FTKN154_DEBUG.h;h=41bf8fdf0cbffe32a9de5d1ccef16261b436b8b3;hb=82c215ff867ea7ef4fa748fb72b686c32ffb25e1;hp=8169f913029abb5509b2f982a05c99fcf378907e;hpb=afb6da3df34fdebb6843598761ef4de5eb0186f6;p=tinyos-2.x.git

diff --git a/tos/lib/mac/tkn154/TKN154_DEBUG.h b/tos/lib/mac/tkn154/TKN154_DEBUG.h
index 8169f913..41bf8fdf 100644
--- a/tos/lib/mac/tkn154/TKN154_DEBUG.h
+++ b/tos/lib/mac/tkn154/TKN154_DEBUG.h
@@ -36,66 +36,6 @@
 #ifndef __TKN154_DEBUG_H
 #define __TKN154_DEBUG_H
 
-#define LEVEL_INFO 0
-#define LEVEL_IMPORTANT 50
-#define LEVEL_CRITICAL 100
-
-#define RadioRxTxP_ACQUIRED         0
-#define RadioRxTxP_NOT_ACQUIRED     1
-#define RadioRxTxP_TRANSFERRED      2
-#define RadioRxTxP_NOT_TRANSFERRED  3
-#define RadioRxTxP_RELEASED         4
-#define RadioRxTxP_NOT_RELEASED     5
-#define RadioRxTxP_TRANSFER_REQUEST 6
-#define RadioRxTxP_DEFAULT_PREPARE_TX_DONE 7
-#define RadioRxTxP_DEFAULT_TX_DONE         8
-#define RadioRxTxP_DEFAULT_PREPARE_RX_DONE 9
-#define RadioRxTxP_DEFAULT_RECEIVED        10
-#define RadioRxTxP_DEFAULT_OFFDONE         11
-#define RadioRxTxP_DEFAULT_TRANSFERRED     12 
-#define RadioRxTxP_DEFAULT_TRANSFERREQUEST 13
-#define RadioRxTxP_ASK_ISOWNER             14
-#define RadioRxTxP_RX_NOOWNER              15
-#define RadioRxTxP_DEFAULT_CANCEL_TX_DONE  16
-#define RadioRxTxP_DEFAULT_CANCEL_RX_DONE  17
-
-#define SyncP_BEACON_MISSED_1 0
-#define SyncP_BEACON_MISSED_2 1
-#define SyncP_BEACON_MISSED_3 2
-#define SyncP_TRACK_ALARM     3
-#define SyncP_INVALID_PARAM   4
-#define SyncP_RX_ON           5
-#define SyncP_INTERNAL_ERROR  6
-#define SyncP_BEACON_RX       7
-#define SyncP_RADIO_BUSY      8
-#define SyncP_LOST_SYNC       9
-#define SyncP_RX_PACKET       10
-#define SyncP_NEXT_RX_TIME    11
-#define SyncP_SWITCHOFF       12
-#define SyncP_RX_GARBAGE      13
-#define SyncP_GOT_RESOURCE    14
-#define SyncP_RELEASE_RESOURCE 15
-#define SyncP_RESOURCE_REQUEST  16
-#define SyncP_TRANSFER_RESOURCE 17
-#define SyncP_PREPARE_RX      18
-#define SyncP_REQUEST  19
-#define SyncP_UPDATING  20
-#define SyncP_PREPARE_RX_DONE     21
-#define SyncP_INVALID_TIMESTAMP     22
-#define SyncP_RX_BEACON       SyncP_RX_PACKET
-
-#define StartP_BEACON_TRANSMITTED 0
-#define StartP_UPDATE_STATE   1
-#define StartP_REQUEST        2
-#define StartP_OWNER_TOO_FAST 3
-#define StartP_BEACON_UPDATE  4
-#define StartP_BEACON_UPDATE_2 5
-#define StartP_PREPARE_TX     6
-#define StartP_PREPARE_TXDONE 7
-#define StartP_SKIPPED_BEACON    8
-#define StartP_GOT_RESOURCE    9
-#define StartP_TRANSMIT    10
-
 #define PollP_ALLOC_FAIL1     0
 #define PollP_ALLOC_FAIL2     1
 #define PollP_INTERNAL_POLL   2
@@ -162,53 +102,41 @@
 #define CoordCapTransmitP_FINISH_TX          5
 #define CoordCapTransmitP_RADIO_RX           6
 
-#define Phy_RX_CANCEL      0
-#define Phy_RX_NOW         1
-#define Phy_LOAD_TX_FIFO   2
-#define Phy_LOAD_TX_FIFO_DONE 3
-#define Phy_LOAD_TX_CANCEL 4
-#define Phy_LOAD_TX_NOW 5
-#define Phy_LOAD_TX_RX_NOW 6
-#define Phy_SEND_DONE 7
-#define Phy_SPI_GRANTED 8
-#define Phy_RADIO_OFF 9
-#define Phy_RADIO_OFF_DONE 10
-#define Phy_RADIO_PREPARE_RX 11
-#define Phy_RADIO_PREPARE_TX 12
-#define Phy_RADIO_TX_DONE 13
-#define Phy_RADIO_RECEIVED 14
 
 #define PhyRx_START 0
 #define PhyRx_STOP 1
 #define PhyRx_FIFOP    2
 #define PhyRx_RXON 3
 
+
 enum {
+  DEBUG_LEVEL_INFO = 0,
+  DEBUG_LEVEL_IMPORTANT = 1,
+  DEBUG_LEVEL_CRITICAL = 2,
+
   // IDs assigned for debugging
-  START_CLIENT = 0,
-  COORD_CAP_CLIENT = 1,
-  COORD_CFP_CLIENT = 2,
-
-  SYNC_CLIENT = 3,
-  DEVICE_CAP_CLIENT = 4,
-  DEVICE_CFP_CLIENT = 5,
-
-  SCAN_CLIENT = 6,
-
-  RADIORXTX_CLIENT = 7,
-  PIBDATABASE_CLIENT = 8,
-  ASSOCIATE_CLIENT = 9,
-  DISASSOCIATE_CLIENT = 10,
-  DEVICECAPQUEUE_CLIENT = 11,
-  INDIRECTTX_DEBUG_CLIENT = 12,
-  DATA_CLIENT = 13,
-  POLL_CLIENT = 14,
-  RXENABLE_CLIENT = 15,
-  PROMISCUOUS_MODE_CLIENT = 16,
-
-  PHY_CLIENT = 17,
-  PHY_TXCLIENT = 18,
-  PHY_RXCLIENT = 19,
+  DEBUG_BEACON_TRANSMIT_ID = 0,
+  DEBUG_FRAME_DISPATCH_COORD_ID = 1,
+  DEBUG_COORD_CFP_ID = 2,
+
+  DEBUG_BEACON_SYNCHRONIZE_ID = 3,
+  DEBUG_FRAME_DISPATCH_DEVICE_ID = 4,
+  DEBUG_DEVICE_CFP_ID = 5,
+
+  DEBUG_SCAN_ID = 6,
+
+  DEBUG_RADIOCONTROL_ID = 7,
+  DEBUG_PIB_ID = 8,
+  DEBUG_ASSOCIATE_ID = 9,
+  DEBUG_DISASSOCIATE_ID = 10,
+  DEBUG_FRAMEDISPATCHQUEUE_ID = 11,
+  DEBUG_INDIRECTTX_ID = 12,
+  DEBUG_DATA_ID = 13,
+  DEBUG_POLL_ID = 14,
+  DEBUG_RXENABLE_ID = 15,
+  DEBUG_PROMISCUOUSMODE_ID = 16,
+  DEBUG_RADIO_DRIVER_ID = 17,
+
 };
 
 typedef nx_struct serial_debug_msg {
@@ -223,7 +151,7 @@ typedef nx_struct serial_debug_msg {
 } serial_debug_msg_t;
 
 #ifndef SERIAL_DBG_MSGBUF_SIZE
-#define SERIAL_DBG_MSGBUF_SIZE 25
+#define SERIAL_DBG_MSGBUF_SIZE  150
 #endif
 
 enum {