summaryrefslogtreecommitdiff
path: root/cleopatre
diff options
context:
space:
mode:
authorsave2009-01-22 10:15:14 +0000
committersave2009-01-22 10:15:14 +0000
commitfb87f8618615f71915c682276e99b6cd577ddfc3 (patch)
tree19a43078a7c914e7c3894c8fb437d3ff4a127434 /cleopatre
parent6e97326b6aa7bbb42d7037fec01958f537777f7b (diff)
[CLEO][PLCDRV]Change trace construction and suppress driver interface in trace for linux layer
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@3839 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre')
-rw-r--r--cleopatre/plcdrv/arm/src/hal.c2
-rw-r--r--cleopatre/plcdrv/arm/src/linux_drv.c70
-rw-r--r--cleopatre/plcdrv/arm/src/mailbox.c2
-rw-r--r--cleopatre/plcdrv/arm/src/processing.c2
4 files changed, 39 insertions, 37 deletions
diff --git a/cleopatre/plcdrv/arm/src/hal.c b/cleopatre/plcdrv/arm/src/hal.c
index a98b29af65..3a8dbe2846 100644
--- a/cleopatre/plcdrv/arm/src/hal.c
+++ b/cleopatre/plcdrv/arm/src/hal.c
@@ -25,7 +25,7 @@
#endif
/** Define Debug/Trace Level */
-#define TRACE(...) printk("SPC300: " __VA_ARGS__)
+#define TRACE(...) printk("SPC300: HAL : " __VA_ARGS__)
//#define TRACE(...)
/** Our global context */
diff --git a/cleopatre/plcdrv/arm/src/linux_drv.c b/cleopatre/plcdrv/arm/src/linux_drv.c
index bc2114edc1..49bea9c5c1 100644
--- a/cleopatre/plcdrv/arm/src/linux_drv.c
+++ b/cleopatre/plcdrv/arm/src/linux_drv.c
@@ -16,8 +16,8 @@
#define DRV_NAME "SPC300"
+#define DRV_LAYER "PLC "
#define DRV_VERSION "1.0"
-//#define DRV_RELDATE "Dec 05, 2008"
#define DRV_RELDATE __DATE__
@@ -55,7 +55,7 @@ MODULE_DESCRIPTION("SPC300 PLC driver");
MODULE_LICENSE("SPiDCOM Technologies 2009");
/** Define Debug/Trace Level */
-#define TRACE(...) printk(DRV_NAME": " __VA_ARGS__)
+#define TRACE(...) printk(DRV_NAME": "DRV_LAYER": " __VA_ARGS__)
//#define TRACE(...)
/** Define default leon translation address */
@@ -153,7 +153,7 @@ int alloc_buffer(enum buffer_type type)
struct sk_buff *skb;
int result;
- TRACE("%s: add_buffer\n", plcdrv_device->name);
+ TRACE("add_buffer\n");
//Allocate an sk_buff
skb = alloc_skb(PKT_BUF_SZ, GFP_KERNEL | GFP_DMA);
@@ -175,6 +175,7 @@ int alloc_buffer(enum buffer_type type)
{
kfree_skb(skb);
}
+ TRACE("add_buffer end\n");
return result;
}// alloc_buffer
@@ -195,7 +196,7 @@ int free_buffer(void *packet, enum free_reason reason)
if(priv == NULL)
return -1;
- TRACE("%s: free_buffer\n", plcdrv_device->name);
+ TRACE("free_buffer\n");
if(packet)
{
@@ -250,7 +251,7 @@ int plcdrv_rx(void *packet, int length)
if(priv == NULL)
return -1;
- TRACE("%s: Receive\n", plcdrv_device->name);
+ TRACE("Receive\n");
//Check packet length size
if((length <= 0) || (length > PKT_BUF_SZ))
@@ -277,7 +278,7 @@ int plcdrv_rx(void *packet, int length)
result = -1;
}
- TRACE("%s: Receive done\n", plcdrv_device->name);
+ TRACE("Receive done\n");
return result;
}// plcdrv_rx
@@ -302,7 +303,7 @@ int plcdrv_tx(struct sk_buff *skb, struct net_device *dev)
if(priv == NULL)
return -1;
- TRACE("%s: Transmit\n", dev->name);
+ TRACE("Transmit\n");
//Send buffer to lower layers
status = processing_send((void *)skb->data, skb->len);
@@ -323,7 +324,7 @@ int plcdrv_tx(struct sk_buff *skb, struct net_device *dev)
//Handle transmit
dev->trans_start = jiffies;
- TRACE("%s: Transmit end\n", dev->name);
+ TRACE("Transmit end\n");
return 0;
}// plcdrv_tx
@@ -341,18 +342,18 @@ irqreturn_t plcdrv_it_rx(int irq, void * dev_id)
int result;
//Check pointer
- if(dev_id == NULL)
+/* if(dev_id == NULL)
return IRQ_NONE;
- dev = (struct net_device*)dev_id;
- TRACE("%s: Receive IT\n", dev->name);
+ dev = (struct net_device*)dev_id;*/
+ TRACE("Receive IT\n");
//Just call the lowest layer procedure
if(mailbox_receive())
result = IRQ_NONE;
else
result = IRQ_HANDLED;
- TRACE("%s: Receive IT end\n", dev->name);
+ TRACE("Receive IT end\n");
return result;
}// plcdrv_it_rx
@@ -372,13 +373,13 @@ irqreturn_t plcdrv_it_txdone(int irq, void * dev_id)
return IRQ_NONE;
dev = (struct net_device*)dev_id;
- TRACE("%s: Transmit Done IT\n", dev->name);
+ TRACE("Transmit Done IT\n");
//A packet was just freeing by the hardware,
//we can restart the tx queue
if(netif_queue_stopped(dev))
netif_wake_queue(dev);
- TRACE("%s: Transmit Done IT end\n", dev->name);
+ TRACE("Transmit Done IT end\n");
return IRQ_HANDLED;
}// plcdrv_it_txdone
@@ -418,7 +419,7 @@ int plcdrv_change_mtu(struct net_device *dev, int new_mtu)
if(dev == NULL)
return -1;
- TRACE("%s: change_mtu\n", dev->name);
+ TRACE("change_mtu\n");
//Check arguments
if(new_mtu < 64 || new_mtu > 1508)
@@ -427,7 +428,7 @@ int plcdrv_change_mtu(struct net_device *dev, int new_mtu)
{
//Change the MTU
dev->mtu = new_mtu;
- TRACE("%s: change_mtu end\n", dev->name);
+ TRACE("change_mtu end\n");
return 0;
}
}// plcdrv_change_mtu
@@ -449,14 +450,14 @@ int plcdrv_set_mac_address(struct net_device *dev, void *p)
if(p == NULL)
return -1;
- TRACE("%s: set_mac_address\n", dev->name);
+ TRACE("set_mac_address\n");
//Store the new address for Linux
memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
//TODO:Store the new address in NVRAM
- TRACE("%s: set_mac_address end\n", dev->name);
+ TRACE("set_mac_address end\n");
return 0;
}// plcdrv_set_mac_address
@@ -477,7 +478,7 @@ int plcdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if(dev == NULL)
return -1;
- TRACE("%s: ioctl\n", dev->name);
+ TRACE("ioctl\n");
//Find the command
switch(cmd)
@@ -486,7 +487,7 @@ int plcdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return -EOPNOTSUPP;
}
- TRACE("%s: ioctl end\n", dev->name);
+ TRACE("ioctl end\n");
return 0;
}// plcdrv_ioctl
@@ -510,7 +511,7 @@ int plcdrv_open(struct net_device *dev)
if(priv == NULL)
return -1;
- TRACE("%s: open\n", dev->name);
+ TRACE("open\n");
//Allocate rings for each mailbox
if((priv->virt_ring_base_addr =
@@ -523,6 +524,7 @@ int plcdrv_open(struct net_device *dev)
printk(KERN_ERR DRV_NAME": Error allocating mailboxes rings for %s\n", dev->name);
return -ENOMEM;
}
+ TRACE("virt@rings=%x ; phys@rings=%x\n",priv->virt_ring_base_addr, priv->phys_ring_base_addr);
//Flush rings for each mailbox
memset((void*)priv->virt_ring_base_addr, 0, A2L_RING_SIZE+L2A_RING_SIZE);
@@ -541,7 +543,7 @@ int plcdrv_open(struct net_device *dev)
if(alloc_buffer(DATA))
{
printk(KERN_ERR DRV_NAME ": %s: error creating DATA buffer pool\n", dev->name);
- return -ENOMEM;
+ return -1;
}
}
for(i=0 ; i<nb_rx_mme_buffers ; i++)
@@ -549,7 +551,7 @@ int plcdrv_open(struct net_device *dev)
if(alloc_buffer(MME))
{
printk(KERN_ERR DRV_NAME ": %s: error creating MME buffer pool\n", dev->name);
- return -ENOMEM;
+ return -1;
}
}
for(i=0 ; i<nb_rx_interface_buffers ; i++)
@@ -557,7 +559,7 @@ int plcdrv_open(struct net_device *dev)
if(alloc_buffer(INTERFACE))
{
printk(KERN_ERR DRV_NAME ": %s: error creating INTERFACE buffer pool\n", dev->name);
- return -ENOMEM;
+ return -1;
}
}
@@ -579,7 +581,7 @@ int plcdrv_open(struct net_device *dev)
return -ENODEV;
}
- TRACE("%s: open end\n", dev->name);
+ TRACE("open end\n");
return 0;
}// plcdrv_open
@@ -601,7 +603,7 @@ int plcdrv_stop(struct net_device *dev)
if(priv == NULL)
return -1;
- TRACE("%s: stop\n", dev->name);
+ TRACE("stop\n");
//Disable transmitter
netif_stop_queue(dev);
@@ -626,7 +628,7 @@ int plcdrv_stop(struct net_device *dev)
//Wait all allocated sk_buff become free
//(a sk_buff become free when we receive a send_done procedure)
- TRACE("%s: stop end\n", dev->name);
+ TRACE("stop end\n");
return 0;
}// plcdrv_stop
@@ -648,7 +650,7 @@ int plcdrv_init(struct net_device *dev)
if(priv == NULL)
return -1;
- TRACE("%s: init\n", dev->name);
+ TRACE("init\n");
//Set IP base address
dev->base_addr = (unsigned int)ioremap(MBX_BASE_ADDR, NB_MBX_REGISTERS);
@@ -674,13 +676,13 @@ int plcdrv_init(struct net_device *dev)
//TODO:Setup MAC address for Linux (stored in NVRAM)
dev->dev_addr[0] = 0x00;
- dev->dev_addr[1] = 0x11;
- dev->dev_addr[2] = 0x22;
- dev->dev_addr[3] = 0x33;
- dev->dev_addr[4] = 0x44;
- dev->dev_addr[5] = 0x55;
+ dev->dev_addr[1] = 0xAA;
+ dev->dev_addr[2] = 0xBB;
+ dev->dev_addr[3] = 0xCC;
+ dev->dev_addr[4] = 0xDD;
+ dev->dev_addr[5] = 0xEE;
- TRACE("%s: init end\n", dev->name);
+ TRACE("init end\n");
return 0;
}// plcdrv_init
diff --git a/cleopatre/plcdrv/arm/src/mailbox.c b/cleopatre/plcdrv/arm/src/mailbox.c
index e6c84dbe02..359391ae0d 100644
--- a/cleopatre/plcdrv/arm/src/mailbox.c
+++ b/cleopatre/plcdrv/arm/src/mailbox.c
@@ -25,7 +25,7 @@
#endif
/** Define Debug/Trace Level */
-#define TRACE(...) printk("SPC300: " __VA_ARGS__)
+#define TRACE(...) printk("SPC300: MAIL: " __VA_ARGS__)
//#define TRACE(...)
/** Data parameters */
diff --git a/cleopatre/plcdrv/arm/src/processing.c b/cleopatre/plcdrv/arm/src/processing.c
index 6318584b21..ef23036fd9 100644
--- a/cleopatre/plcdrv/arm/src/processing.c
+++ b/cleopatre/plcdrv/arm/src/processing.c
@@ -45,7 +45,7 @@ static inline unsigned short int ntohs(unsigned short int x)
#endif // __LINUX__
/** Define Debug/Trace Level */
-#define TRACE(...) printk("SPC300: " __VA_ARGS__)
+#define TRACE(...) printk("SPC300: PROC: " __VA_ARGS__)
//#define TRACE(...)
/** Define HPAV Ethernet type */