Skip to content

Commit 1684127

Browse files
dbestmdbestm
committed
Merge branch 'master' of https://github.com/mbedmicro/mbed 
2 parents 48f9602 + 158cbeb commit 1684127

File tree

136 files changed

+13892
-3118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+13892
-3118
lines changed

‎libraries/USBDevice/USBAudio/USBAudio.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ float USBAudio::getVolume() {
119119
}
120120

121121

122-
bool USBAudio::EP3_OUT_callback() {
122+
bool USBAudio::EPISO_OUT_callback() {
123123
uint32_t size = 0;
124124
interruptOUT = true;
125125
if (buf_stream_in != NULL) {
@@ -132,7 +132,7 @@ bool USBAudio::EP3_OUT_callback() {
132132
}
133133

134134

135-
bool USBAudio::EP3_IN_callback() {
135+
bool USBAudio::EPISO_IN_callback() {
136136
interruptIN = true;
137137
writeIN = true;
138138
return true;

‎libraries/USBDevice/USBAudio/USBAudio.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,12 @@ class USBAudio: public USBDevice {
216216
/*
217217
* Callback called when a packet is received
218218
*/
219-
virtual bool EP3_OUT_callback();
219+
virtual bool EPISO_OUT_callback();
220220

221221
/*
222222
* Callback called when a packet has been sent
223223
*/
224-
virtual bool EP3_IN_callback();
224+
virtual bool EPISO_IN_callback();
225225

226226
private:
227227

‎libraries/USBDevice/USBDevice/USBEndpoints_KL25Z.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,18 @@
8181
/* Bulk endpoints */
8282
#define EPBULK_OUT (EP2OUT)
8383
#define EPBULK_IN (EP2IN)
84+
#define EPBULK_OUT_callback EP2_OUT_callback
85+
#define EPBULK_IN_callback EP2_IN_callback
8486
/* Interrupt endpoints */
8587
#define EPINT_OUT (EP1OUT)
8688
#define EPINT_IN (EP1IN)
89+
#define EPINT_OUT_callback EP1_OUT_callback
90+
#define EPINT_IN_callback EP1_IN_callback
8791
/* Isochronous endpoints */
8892
#define EPISO_OUT (EP3OUT)
8993
#define EPISO_IN (EP3IN)
94+
#define EPISO_OUT_callback EP3_OUT_callback
95+
#define EPISO_IN_callback EP3_IN_callback
9096

9197
#define MAX_PACKET_SIZE_EPBULK (MAX_PACKET_SIZE_EP2)
9298
#define MAX_PACKET_SIZE_EPINT (MAX_PACKET_SIZE_EP1)

‎libraries/USBDevice/USBDevice/USBEndpoints_LPC11U.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,18 @@
5353
/* Bulk endpoint */
5454
#define EPBULK_OUT (EP2OUT)
5555
#define EPBULK_IN (EP2IN)
56+
#define EPBULK_OUT_callback EP2_OUT_callback
57+
#define EPBULK_IN_callback EP2_IN_callback
5658
/* Interrupt endpoint */
5759
#define EPINT_OUT (EP1OUT)
5860
#define EPINT_IN (EP1IN)
61+
#define EPINT_OUT_callback EP1_OUT_callback
62+
#define EPINT_IN_callback EP1_IN_callback
5963
/* Isochronous endpoint */
6064
#define EPISO_OUT (EP3OUT)
6165
#define EPISO_IN (EP3IN)
66+
#define EPISO_OUT_callback EP3_OUT_callback
67+
#define EPISO_IN_callback EP3_IN_callback
6268

6369
#define MAX_PACKET_SIZE_EPBULK (MAX_PACKET_SIZE_EP2)
6470
#define MAX_PACKET_SIZE_EPINT (MAX_PACKET_SIZE_EP1)

‎libraries/USBDevice/USBDevice/USBEndpoints_LPC17_LPC23.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,18 @@
8181
/* Bulk endpoints */
8282
#define EPBULK_OUT (EP2OUT)
8383
#define EPBULK_IN (EP2IN)
84+
#define EPBULK_OUT_callback EP2_OUT_callback
85+
#define EPBULK_IN_callback EP2_IN_callback
8486
/* Interrupt endpoints */
8587
#define EPINT_OUT (EP1OUT)
8688
#define EPINT_IN (EP1IN)
89+
#define EPINT_OUT_callback EP1_OUT_callback
90+
#define EPINT_IN_callback EP1_IN_callback
8791
/* Isochronous endpoints */
8892
#define EPISO_OUT (EP3OUT)
8993
#define EPISO_IN (EP3IN)
94+
#define EPISO_OUT_callback EP3_OUT_callback
95+
#define EPISO_IN_callback EP3_IN_callback
9096

9197
#define MAX_PACKET_SIZE_EPBULK (MAX_PACKET_SIZE_EP2)
9298
#define MAX_PACKET_SIZE_EPINT (MAX_PACKET_SIZE_EP1)

‎libraries/USBDevice/USBDevice/USBEndpoints_RZ_A1H.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,18 @@
6565
/* Bulk endpoints */
6666
#define EPBULK_OUT (EP2OUT)
6767
#define EPBULK_IN (EP2IN)
68+
#define EPBULK_OUT_callback EP2_OUT_callback
69+
#define EPBULK_IN_callback EP2_IN_callback
6870
/* Interrupt endpoints */
6971
#define EPINT_OUT (EP1OUT)
7072
#define EPINT_IN (EP1IN)
73+
#define EPINT_OUT_callback EP1_OUT_callback
74+
#define EPINT_IN_callback EP1_IN_callback
7175
/* Isochronous endpoints */
7276
#define EPISO_OUT (EP3OUT)
7377
#define EPISO_IN (EP3IN)
78+
#define EPISO_OUT_callback EP3_OUT_callback
79+
#define EPISO_IN_callback EP3_IN_callback
7480

7581
#define MAX_PACKET_SIZE_EPBULK (MAX_PACKET_SIZE_EP2)
7682
#define MAX_PACKET_SIZE_EPINT (MAX_PACKET_SIZE_EP1)

‎libraries/USBDevice/USBDevice/USBEndpoints_STM32F4.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,18 @@
4949
/* Bulk endpoint */
5050
#define EPBULK_OUT (EP2OUT)
5151
#define EPBULK_IN (EP2IN)
52+
#define EPBULK_OUT_callback EP2_OUT_callback
53+
#define EPBULK_IN_callback EP2_IN_callback
5254
/* Interrupt endpoint */
5355
#define EPINT_OUT (EP1OUT)
5456
#define EPINT_IN (EP1IN)
57+
#define EPINT_OUT_callback EP1_OUT_callback
58+
#define EPINT_IN_callback EP1_IN_callback
5559
/* Isochronous endpoint */
5660
#define EPISO_OUT (EP3OUT)
5761
#define EPISO_IN (EP3IN)
62+
#define EPISO_OUT_callback EP3_OUT_callback
63+
#define EPISO_IN_callback EP3_IN_callback
5864

5965
#define MAX_PACKET_SIZE_EPBULK (MAX_PACKET_SIZE_EP2)
6066
#define MAX_PACKET_SIZE_EPINT (MAX_PACKET_SIZE_EP1)

‎libraries/USBDevice/USBHID/USBKeyboard.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ uint8_t * USBKeyboard::reportDesc() {
420420
}
421421

422422

423-
bool USBKeyboard::EP1_OUT_callback() {
423+
bool USBKeyboard::EPINT_OUT_callback() {
424424
uint32_t bytesRead = 0;
425425
uint8_t led[65];
426426
USBDevice::readEP(EPINT_OUT, led, &bytesRead, MAX_HID_REPORT_SIZE);

‎libraries/USBDevice/USBHID/USBKeyboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ class USBKeyboard: public USBHID, public Stream {
150150
*
151151
* @returns if handle by subclass, return true
152152
*/
153-
virtual bool EP1_OUT_callback();
153+
virtual bool EPINT_OUT_callback();
154154

155155
/**
156156
* Read status of lock keys. Useful to switch-on/off leds according to key pressed. Only the first three bits of the result is important:

‎libraries/USBDevice/USBHID/USBMouseKeyboard.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ uint8_t * USBMouseKeyboard::reportDesc() {
548548
return NULL;
549549
}
550550

551-
bool USBMouseKeyboard::EP1_OUT_callback() {
551+
bool USBMouseKeyboard::EPINT_OUT_callback() {
552552
uint32_t bytesRead = 0;
553553
uint8_t led[65];
554554
USBDevice::readEP(EPINT_OUT, led, &bytesRead, MAX_HID_REPORT_SIZE);

‎libraries/USBDevice/USBHID/USBMouseKeyboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ class USBMouseKeyboard: public USBHID, public Stream
202202
*
203203
* @returns if handle by subclass, return true
204204
*/
205-
virtual bool EP1_OUT_callback();
205+
virtual bool EPINT_OUT_callback();
206206

207207

208208
private:

‎libraries/USBDevice/USBMIDI/USBMIDI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void USBMIDI::attach(void (*fptr)(MIDIMessage)) {
3535
}
3636

3737

38-
bool USBMIDI::EP2_OUT_callback() {
38+
bool USBMIDI::EPBULK_OUT_callback() {
3939
uint8_t buf[64];
4040
uint32_t len;
4141
readEP(EPBULK_OUT, buf, &len, 64);

‎libraries/USBDevice/USBMIDI/USBMIDI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class USBMIDI: public USBDevice {
7878

7979

8080
protected:
81-
virtual bool EP2_OUT_callback();
81+
virtual bool EPBULK_OUT_callback();
8282
virtual bool USBCallback_setConfiguration(uint8_t configuration);
8383
/*
8484
* Get string product descriptor

‎libraries/USBDevice/USBMSD/USBMSD.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void USBMSD::reset() {
147147

148148

149149
// Called in ISR context called when a data is received
150-
bool USBMSD::EP2_OUT_callback() {
150+
bool USBMSD::EPBULK_OUT_callback() {
151151
uint32_t size = 0;
152152
uint8_t buf[MAX_PACKET_SIZE_EPBULK];
153153
readEP(EPBULK_OUT, buf, &size, MAX_PACKET_SIZE_EPBULK);
@@ -184,7 +184,7 @@ bool USBMSD::EP2_OUT_callback() {
184184
}
185185

186186
// Called in ISR context when a data has been transferred
187-
bool USBMSD::EP2_IN_callback() {
187+
bool USBMSD::EPBULK_IN_callback() {
188188
switch (stage) {
189189

190190
// the device has to send data to the host

‎libraries/USBDevice/USBMSD/USBMSD.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,12 @@ class USBMSD: public USBDevice {
158158
/*
159159
* Callback called when a packet is received
160160
*/
161-
virtual bool EP2_OUT_callback();
161+
virtual bool EPBULK_OUT_callback();
162162

163163
/*
164164
* Callback called when a packet has been sent
165165
*/
166-
virtual bool EP2_IN_callback();
166+
virtual bool EPBULK_IN_callback();
167167

168168
/*
169169
* Set configuration of device. Add endpoints

‎libraries/USBDevice/USBSerial/USBSerial.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ bool USBSerial::writeBlock(uint8_t * buf, uint16_t size) {
4646

4747

4848

49-
bool USBSerial::EP2_OUT_callback() {
49+
bool USBSerial::EPBULK_OUT_callback() {
5050
uint8_t c[65];
5151
uint32_t size = 0;
5252

‎libraries/USBDevice/USBSerial/USBSerial.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class USBSerial: public USBCDC, public Stream {
145145
}
146146

147147
protected:
148-
virtual bool EP2_OUT_callback();
148+
virtual bool EPBULK_OUT_callback();
149149
virtual void lineCodingChanged(int baud, int bits, int parity, int stop){
150150
if (settingsChangedCallback) {
151151
settingsChangedCallback(baud, bits, parity, stop);

‎libraries/mbed/targets/cmsis/TARGET_Maxim/TARGET_MAX32610/TOOLCHAIN_ARM_STD/MAX32610.sct

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
2+
; MAX32610
3+
; 256KB FLASH (0x40000) @ 0x000000000
4+
; 2KB RAM (0x8000) @ 0x20000000
5+
6+
7+
; MAX32610: 256KB FLASH (0x40000) + 32KB RAM (0x8000)
8+
9+
LR_IROM1 0x00000000 0x40000 { ; load region size_region
10+
ER_IROM1 0x00000000 0x40000 { ; load address = execution address
11+
*.o (RESET, +First)
12+
*(InRoot$$Sections)
13+
.ANY (+RO)
14+
}
15+
16+
; [RAM] Vector table dynamic copy: 79 vectors * 4 bytes = (0x140) - alignment
17+
RW_IRAM1 (0x20000000+0x140) (0x8000-0x140) { ; RW data
18+
.ANY (+RW +ZI)
19+
}
20+
21+
}

0 commit comments

Comments
 (0)