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

Merge branch 'master' of https://github.com/mbedmicro/mbed

pull/10/head
Emilio Monti 2013-07-02 16:45:35 +01:00
parent cd669a943f da778bd931
commit a19e99621f
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/net/VodafoneUSBModem/core/MtxCircBuffer.h
View File

@ -55,19 +55,13 @@ public:
void queue(T k) void queue(T k)
{ {
mtx.lock(); mtx.lock();
while (((write + 1) % size) == read) //if (isFull())
{
/*while((((write + 1) % size) == read))
{*/
mtx.unlock();
Thread::wait(10);
mtx.lock();
/*}*/
//read++;
//read %= size;
}
buf[write++] = k; buf[write++] = k;
write %= size; write %= size;
if (isFull())
{
read++;
read %= size;
}
mtx.unlock(); mtx.unlock();
} }

2
workspace_tools/debugger/pyOCD/target/cortex_m.py
View File

@ -167,7 +167,7 @@ class CortexM(Target):
while True: while True:
r = self.transport.readDP(DP_REG['CTRL_STAT']) r = self.transport.readDP(DP_REG['CTRL_STAT'])
if (r & (CDBGPWRUPACK | CSYSPWRUPACK)) != (CSYSPWRUPREQ | CDBGPWRUPREQ): if (r & (CDBGPWRUPACK | CSYSPWRUPACK)) != (CDBGPWRUPACK | CSYSPWRUPACK):
break break
self.transport.writeDP(DP_REG['CTRL_STAT'], CSYSPWRUPREQ | CDBGPWRUPREQ | TRNNORMAL | MASKLANE) self.transport.writeDP(DP_REG['CTRL_STAT'], CSYSPWRUPREQ | CDBGPWRUPREQ | TRNNORMAL | MASKLANE)

2
workspace_tools/debugger/setup.py
View File

@ -23,7 +23,7 @@ setup(
description="CMSIS-DAP debugger for python", description="CMSIS-DAP debugger for python",
author="samux", author="samux",
author_email="samuel.mokrani@gmail.com", author_email="samuel.mokrani@gmail.com",
license="MIT", license="Apache 2.0",
classifiers = [ classifiers = [
"Development Status :: 4 - Beta", "Development Status :: 4 - Beta",
"License :: Apache 2.0", "License :: Apache 2.0",