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

Modifications for compatibility with GCC

pull/88/head
Bogdan Marinescu 2013-10-17 10:33:19 +03:00
parent 2f26d09606
commit 6a5d7c654d
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/USBHost/USBHost3GModule/IUSBHostSerial.h
View File

@ -30,6 +30,10 @@
#include "IUSBHostSerialListener.h" #include "IUSBHostSerialListener.h"
// This is needed by some versions of GCC
#undef putc
#undef getc
class IUSBHostSerial { class IUSBHostSerial {
public: public:

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

@ -26,7 +26,7 @@
#endif #endif
#include "dbg.h" #include "dbg.h"
#include <cstdint> #include <stdint.h>
#include "rtos.h" #include "rtos.h"
#include "WANDongle.h" #include "WANDongle.h"
@ -168,7 +168,7 @@ void WANDongle::init()
{ {
WANDongleInitializer* initializer; WANDongleInitializer* initializer;
for(unsigned i = 0; i < m_totalInitializers; i++) for(int i = 0; i < m_totalInitializers; i++)
{ {
initializer = m_Initializers[i]; initializer = m_Initializers[i];
USB_DBG("initializer=%p", initializer); USB_DBG("initializer=%p", initializer);
@ -229,7 +229,7 @@ bool WANDongle::addInitializer(WANDongleInitializer* pInitializer)
WANDongle::~WANDongle() WANDongle::~WANDongle()
{ {
for(unsigned i = 0; i < m_totalInitializers; i++) for(int i = 0; i < m_totalInitializers; i++)
delete m_Initializers[i]; delete m_Initializers[i];
} }

5
libraries/USBHost/USBHost3GModule/WANDongleInitializer.h
View File

@ -23,9 +23,7 @@
#ifdef USBHOST_3GMODULE #ifdef USBHOST_3GMODULE
#include <cstdint> #include <stdint.h>
using std::uint16_t;
using std::uint32_t;
#include "USBHost.h" #include "USBHost.h"
#include "IUSBEnumerator.h" #include "IUSBEnumerator.h"
@ -44,6 +42,7 @@ protected:
uint8_t m_serialIntfMap[WANDONGLE_MAX_SERIAL_PORTS]; uint8_t m_serialIntfMap[WANDONGLE_MAX_SERIAL_PORTS];
public: public:
virtual ~WANDongleInitializer() {}
virtual uint16_t getMSDVid() = 0; virtual uint16_t getMSDVid() = 0;
virtual uint16_t getMSDPid() = 0; virtual uint16_t getMSDPid() = 0;

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

@ -26,7 +26,7 @@
#endif #endif
#include "dbg.h" #include "dbg.h"
#include <cstdint> #include <stdint.h>
#include "rtos.h" #include "rtos.h"
#include "WANDongleSerialPort.h" #include "WANDongleSerialPort.h"