ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed debugging macros in WANDongle and WANDongleSerialPort 

Now they use "dbg.h" which is a part of USBHost, thus eliminating the
dependency on code from CellularModem.
pull/88/head
Bogdan Marinescu 2013-10-16 23:58:40 +03:00
parent aa209e3002
commit 2f26d09606
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libraries/USBHost/USBHost3GModule/WANDongle.cpp
View File

@ -25,7 +25,7 @@
#define __MODULE__ "WANDongle.cpp"
#endif
#include "core/dbg.h"
#include "dbg.h"
#include <cstdint>
#include "rtos.h"
@ -47,7 +47,7 @@ bool WANDongle::tryConnect()
{
//FIXME should run on USB thread
DBG("Trying to connect device");
USB_DBG("Trying to connect device");
if (dev_connected) {
return true;
@ -61,23 +61,23 @@ bool WANDongle::tryConnect()
{
m_pInitializer = NULL; //Will be set in setVidPid callback
DBG("Enumerate");
USB_DBG("Enumerate");
int ret = host->enumerate(dev, this);
if(ret)
{
return false;
}
DBG("Device has VID:%04x PID:%04x", dev->getVid(), dev->getPid());
USB_DBG("Device has VID:%04x PID:%04x", dev->getVid(), dev->getPid());
if(m_pInitializer) //If an initializer has been found
{
DBG("m_pInitializer=%p", m_pInitializer);
DBG("m_pInitializer->getSerialVid()=%04x", m_pInitializer->getSerialVid());
DBG("m_pInitializer->getSerialPid()=%04x", m_pInitializer->getSerialPid());
USB_DBG("m_pInitializer=%p", m_pInitializer);
USB_DBG("m_pInitializer->getSerialVid()=%04x", m_pInitializer->getSerialVid());
USB_DBG("m_pInitializer->getSerialPid()=%04x", m_pInitializer->getSerialPid());
if ((dev->getVid() == m_pInitializer->getSerialVid()) && (dev->getPid() == m_pInitializer->getSerialPid()))
{
DBG("The dongle is in virtual serial mode");
USB_DBG("The dongle is in virtual serial mode");
host->registerDriver(dev, 0, this, &WANDongle::init);
m_serialCount = m_pInitializer->getSerialPortCount();
if( m_serialCount > WANDONGLE_MAX_SERIAL_PORTS )
@ -86,13 +86,13 @@ bool WANDongle::tryConnect()
}
for(int j = 0; j < m_serialCount; j++)
{
DBG("Connecting serial port #%d", j+1);
DBG("Ep %p", m_pInitializer->getEp(dev, j, false));
DBG("Ep %p", m_pInitializer->getEp(dev, j, true));
USB_DBG("Connecting serial port #%d", j+1);
USB_DBG("Ep %p", m_pInitializer->getEp(dev, j, false));
USB_DBG("Ep %p", m_pInitializer->getEp(dev, j, true));
m_serial[j].connect( dev, m_pInitializer->getEp(dev, j, false), m_pInitializer->getEp(dev, j, true) );
}
DBG("Device connected");
USB_DBG("Device connected");
dev_connected = true;
@ -101,16 +101,16 @@ bool WANDongle::tryConnect()
}
else if ((dev->getVid() == m_pInitializer->getMSDVid()) && (dev->getPid() == m_pInitializer->getMSDPid()))
{
DBG("Vodafone K3370 dongle detected in MSD mode");
USB_DBG("Vodafone K3370 dongle detected in MSD mode");
//Try to switch
if( m_pInitializer->switchMode(dev) )
{
DBG("Switched OK");
USB_DBG("Switched OK");
return false; //Will be connected on a next iteration
}
else
{
ERR("Could not switch mode");
USB_ERR("Could not switch mode");
return false;
}
}
@ -171,18 +171,18 @@ void WANDongle::init()
for(unsigned i = 0; i < m_totalInitializers; i++)
{
initializer = m_Initializers[i];
DBG("initializer=%p", initializer);
DBG("initializer->getSerialVid()=%04x", initializer->getSerialVid());
DBG("initializer->getSerialPid()=%04x", initializer->getSerialPid());
USB_DBG("initializer=%p", initializer);
USB_DBG("initializer->getSerialVid()=%04x", initializer->getSerialVid());
USB_DBG("initializer->getSerialPid()=%04x", initializer->getSerialPid());
if ((dev->getVid() == initializer->getSerialVid()) && (dev->getPid() == initializer->getSerialPid()))
{
DBG("The dongle is in virtual serial mode");
USB_DBG("The dongle is in virtual serial mode");
m_pInitializer = initializer;
break;
}
else if ((dev->getVid() == initializer->getMSDVid()) && (dev->getPid() == initializer->getMSDPid()))
{
DBG("Dongle detected in MSD mode");
USB_DBG("Dongle detected in MSD mode");
m_pInitializer = initializer;
break;
}

26
libraries/USBHost/USBHost3GModule/WANDongleSerialPort.cpp
View File

@ -25,7 +25,7 @@
#define __MODULE__ "WANDongleSerialPort.cpp"
#endif
#include "core/dbg.h"
#include "dbg.h"
#include <cstdint>
#include "rtos.h"
@ -65,31 +65,31 @@ void WANDongleSerialPort::reset()
int WANDongleSerialPort::readPacket()
{
DBG("Read packet on %p", this);
USB_DBG("Read packet on %p", this);
rx_mtx.lock();
if(lock_rx)
{
ERR("Fail");
USB_ERR("Fail");
rx_mtx.unlock();
return -1;
}
if( bulk_in == NULL )
{
WARN("Port is disconnected");
USB_WARN("Port is disconnected");
rx_mtx.unlock();
return -1;
}
lock_rx = true; //Receiving
rx_mtx.unlock();
// DBG("readPacket");
// USB_DBG("readPacket");
//lock_rx.lock();
USB_TYPE res = host->bulkRead(dev, (USBEndpoint *)bulk_in, buf_in, ((USBEndpoint *)bulk_in)->getSize(), false); //Queue transfer
if(res != USB_TYPE_PROCESSING)
{
//lock_rx.unlock();
ERR("host->bulkRead() returned %d", res);
USB_ERR("host->bulkRead() returned %d", res);
Thread::wait(100);
return -1;
}
@ -101,28 +101,28 @@ int WANDongleSerialPort::writePacket()
tx_mtx.lock();
if(lock_tx)
{
ERR("Fail");
USB_ERR("Fail");
tx_mtx.unlock();
return -1;
}
if( bulk_out == NULL )
{
WARN("Port is disconnected");
USB_WARN("Port is disconnected");
tx_mtx.unlock();
return -1;
}
lock_tx = true; //Transmitting
tx_mtx.unlock();
// DBG("writePacket");
// USB_DBG("writePacket");
//lock_tx.lock();
USB_TYPE res = host->bulkWrite(dev, (USBEndpoint *)bulk_out, buf_out, buf_out_len, false); //Queue transfer
if(res != USB_TYPE_PROCESSING)
{
//lock_tx.unlock();
ERR("host->bulkWrite() returned %d", res);
USB_ERR("host->bulkWrite() returned %d", res);
Thread::wait(100);
return -1;
}
@ -142,7 +142,7 @@ int WANDongleSerialPort::putc(int c)
}
else
{
ERR("CAN'T WRITE!");
USB_ERR("CAN'T WRITE!");
}
tx_mtx.unlock();
return c;
@ -162,7 +162,7 @@ int WANDongleSerialPort::getc()
}
else
{
ERR("CAN'T READ!");
USB_ERR("CAN'T READ!");
}
rx_mtx.unlock();
return c;
@ -305,7 +305,7 @@ void WANDongleSerialPort::rxHandler()
else //Error, try reading again
{
//lock_rx.unlock();
DBG("Trying again");
USB_DBG("Trying again");
readPacket();
}
}