Skip to content

Commit a983604

Browse files
dmitrystudmitrystu
authoredJan 26, 2021
Fix/wpedantic (dmitrystu#78)
* fix some warnings with -Wpedantic option * fix ldr macro
1 parent 5eb622d commit a983604

6 files changed

+159
-151
lines changed
 

‎demo/cdc_loop.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static usbd_respond cdc_getdesc (usbd_ctlreq *req, void **address, uint16_t *len
298298
*address = (void*)desc;
299299
*length = len;
300300
return usbd_ack;
301-
};
301+
}
302302

303303

304304
static usbd_respond cdc_control(usbd_device *dev, usbd_ctlreq *req, usbd_rqc_callback *callback) {
@@ -514,12 +514,13 @@ void main(void) {
514514
}
515515
}
516516
#else
517-
void main(void) {
517+
int main(void) {
518518
cdc_init_usbd();
519519
usbd_enable(&udev, true);
520520
usbd_connect(&udev, true);
521521
while(1) {
522522
usbd_poll(&udev);
523523
}
524+
return 0;
524525
}
525526
#endif

‎inc/usbd_core.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105

106106
#if !defined(__ASSEMBLER__)
107107
#include <stdbool.h>
108-
108+
#include <stddef.h>
109109
/** @brief USB device machine states
110110
*/
111111
enum usbd_machine_state {
@@ -348,7 +348,7 @@ inline static void usbd_init(usbd_device *dev, const struct usbd_driver *drv,
348348
dev->status.ep0size = ep0size;
349349
dev->status.data_ptr = buffer;
350350
dev->status.data_buf = buffer;
351-
dev->status.data_maxsize = bsize - __builtin_offsetof(usbd_ctlreq, data);
351+
dev->status.data_maxsize = bsize - offsetof(usbd_ctlreq, data);
352352
}
353353

354354
/**\brief Polls USB for events

‎src/usbd_core.c

+22-14
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ static void usbd_process_eptx(usbd_device *dev, uint8_t ep) {
209209
case usbd_ctl_txdata:
210210
_t = _MIN(dev->status.data_count, dev->status.ep0size);
211211
dev->driver->ep_write(ep, dev->status.data_ptr, _t);
212-
dev->status.data_ptr += _t;
212+
dev->status.data_ptr = (uint8_t*)dev->status.data_ptr + _t;
213213
dev->status.data_count -= _t;
214214
/* if all data is not sent */
215215
if (0 != dev->status.data_count) break;
@@ -224,7 +224,8 @@ static void usbd_process_eptx(usbd_device *dev, uint8_t ep) {
224224
break;
225225
case usbd_ctl_statusin:
226226
dev->status.control_state = usbd_ctl_idle;
227-
return usbd_process_callback(dev);
227+
usbd_process_callback(dev);
228+
break;
228229
default:
229230
/* unexpected TX completion */
230231
/* just skipping it */
@@ -243,15 +244,17 @@ static void usbd_process_eprx(usbd_device *dev, uint8_t ep) {
243244
case usbd_ctl_idle:
244245
/* read SETUP packet, send STALL_PID if incorrect packet length */
245246
if (0x08 != dev->driver->ep_read(ep, req, dev->status.data_maxsize)) {
246-
return usbd_stall_pid(dev, ep);
247+
usbd_stall_pid(dev, ep);
248+
return;
247249
}
248250
dev->status.data_ptr = req->data;
249251
dev->status.data_count = req->wLength;
250252
/* processing request with no payload data*/
251253
if ((req->bmRequestType & USB_REQ_DEVTOHOST) || (0 == req->wLength)) break;
252254
/* checking available memory for DATA OUT stage */
253255
if (req->wLength > dev->status.data_maxsize) {
254-
return usbd_stall_pid(dev, ep);
256+
usbd_stall_pid(dev, ep);
257+
return;
255258
}
256259
/* continue DATA OUT stage */
257260
dev->status.control_state = usbd_ctl_rxdata;
@@ -262,22 +265,25 @@ static void usbd_process_eprx(usbd_device *dev, uint8_t ep) {
262265
if (dev->status.data_count < _t) {
263266
/* if received packet is large than expected */
264267
/* Must be error. Let's drop this request */
265-
return usbd_stall_pid(dev, ep);
268+
usbd_stall_pid(dev, ep);
269+
return;
266270
} else if (dev->status.data_count != _t) {
267271
/* if all data payload was not received yet */
268272
dev->status.data_count -= _t;
269-
dev->status.data_ptr += _t;
273+
dev->status.data_ptr = (uint8_t*)dev->status.data_ptr + _t;
270274
return;
271275
}
272276
break;
273277
case usbd_ctl_statusout:
274278
/* fake reading STATUS OUT */
275279
dev->driver->ep_read(ep, 0, 0);
276280
dev->status.control_state = usbd_ctl_idle;
277-
return usbd_process_callback(dev);
281+
usbd_process_callback(dev);
282+
return;
278283
default:
279284
/* unexpected RX packet */
280-
return usbd_stall_pid(dev, ep);
285+
usbd_stall_pid(dev, ep);
286+
return;
281287
}
282288
/* usb request received. let's handle it */
283289
dev->status.data_ptr = req->data;
@@ -294,8 +300,7 @@ static void usbd_process_eprx(usbd_device *dev, uint8_t ep) {
294300
/* ZLP maybe wanted */
295301
dev->status.control_state = usbd_ctl_ztxdata;
296302
}
297-
return usbd_process_eptx(dev, ep | 0x80);
298-
303+
usbd_process_eptx(dev, ep | 0x80);
299304
} else {
300305
/* confirming by ZLP in STATUS_IN stage */
301306
dev->driver->ep_write(ep | 0x80, 0, 0);
@@ -306,7 +311,8 @@ static void usbd_process_eprx(usbd_device *dev, uint8_t ep) {
306311
dev->status.control_state = usbd_ctl_statusin;
307312
break;
308313
default:
309-
return usbd_stall_pid(dev, ep);
314+
usbd_stall_pid(dev, ep);
315+
break;
310316
}
311317
}
312318

@@ -321,9 +327,11 @@ static void usbd_process_ep0 (usbd_device *dev, uint8_t event, uint8_t ep) {
321327
dev->status.control_state = usbd_ctl_idle;
322328
dev->complete_callback = 0;
323329
case usbd_evt_eprx:
324-
return usbd_process_eprx(dev, ep);
330+
usbd_process_eprx(dev, ep);
331+
break;
325332
case usbd_evt_eptx:
326-
return usbd_process_eptx(dev, ep);
333+
usbd_process_eptx(dev, ep);
334+
break;
327335
default:
328336
break;
329337
}
@@ -352,5 +360,5 @@ static void usbd_process_evt(usbd_device *dev, uint8_t evt, uint8_t ep) {
352360
}
353361

354362
__attribute__((externally_visible)) void usbd_poll(usbd_device *dev) {
355-
return dev->driver->poll(dev, usbd_process_evt);
363+
dev->driver->poll(dev, usbd_process_evt);
356364
}

‎src/usbd_stm32f103_devfs_asm.S

+44-45
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ _connect:
204204
#define GPIO_CRx GPIO_CRH
205205
#define DP_PIN (4 * (USBD_DP_PIN - 8))
206206
#endif
207-
ldr r3, =#USBD_DP_PORT
207+
ldr r3, =USBD_DP_PORT
208208
ldr r2, [r3, #GPIO_CRx]
209209
movs r1, #0x0F
210210
bics r2, r2, r1, LSL #DP_PIN
@@ -218,7 +218,7 @@ _connect:
218218
orrs r2, r2, r1, LSL #DP_PIN
219219
str r2, [r3, #GPIO_CRx]
220220
#elif defined(USBD_DP_PORT) && defined(USBD_DP_PIN) && defined(STM32F3)
221-
ldr r3, =#USBD_DP_PORT
221+
ldr r3, =USBD_DP_PORT
222222
ldr r2, [r3, #GPIO_MODER]
223223
movs r1, #0x03
224224
bics r2, r2, r1, LSL #(2 * USBD_DP_PIN)
@@ -237,7 +237,7 @@ _connect:
237237
.thumb_func
238238
.type _setaddr, %function
239239
_setaddr:
240-
ldr r1, =#USB_REGBASE
240+
ldr r1, =USB_REGBASE
241241
adds r0, #0x80
242242
strh r0, [r1, #USB_DADDR] //USB->DADDR
243243
bx lr
@@ -246,7 +246,7 @@ _setaddr:
246246
.thumb_func
247247
.type _get_frame, %function
248248
_get_frame:
249-
ldr r0, =#USB_REGBASE
249+
ldr r0, =USB_REGBASE
250250
ldrh r0, [r0, #USB_FNR] //FNR
251251
lsls r0, #21
252252
lsrs r0, #21
@@ -256,7 +256,7 @@ _get_frame:
256256
.thumb_func
257257
.type _enable, %function
258258
_enable:
259-
ldr r2, =#RCC_BASE //RCC
259+
ldr r2, =RCC_BASE //RCC
260260
movs r1, #0x01
261261
lsls r3, r1, #23 //USBEN or USBRST
262262
cbz r0, .L_disable
@@ -274,7 +274,7 @@ _enable:
274274
orrs r0, r1
275275
str r0, [r2, #RCC_APB2ENR]
276276
#endif
277-
ldr r1, =#USB_REGBASE
277+
ldr r1, =USB_REGBASE
278278
ldr r0, [r2, #RCC_APB1ENR]
279279
orrs r0, r3
280280
str r0, [r2, #RCC_APB1ENR] //RCC->APB1ENR |= USBEN
@@ -309,13 +309,13 @@ _enable:
309309
.type _getinfo, %function
310310
_getinfo:
311311
movs r0, #0
312-
ldr r2, =#RCC_BASE
312+
ldr r2, =RCC_BASE
313313
ldr r1, [r2, #RCC_APB1ENR]
314314
lsrs r1, #24 //USBEN -> CF
315315
bcc .L_getinfo_end
316316
adds r0, #USBD_HW_ENABLED
317317
#if defined(USBD_DP_PORT) && defined(USBD_DP_PIN)
318-
ldr r2, =#USBD_DP_PORT
318+
ldr r2, =USBD_DP_PORT
319319
ldr r1, [r2, #GPIO_IDR]
320320
lsrs r1, #USBD_DP_PIN //USBD_DP_PIN -> CF
321321
bcc .L_getinfo_end
@@ -335,7 +335,7 @@ _ep_setstall:
335335
push {r4, lr}
336336
lsls r2, r0, #28
337337
lsrs r2, #26
338-
ldr r3, =#USB_EPBASE
338+
ldr r3, =USB_EPBASE
339339
adds r3, r2 // epr -> r3
340340
movs r2, 0x30 // TX_STAT_MASK -> r2
341341
ldrh r4, [r3]
@@ -346,25 +346,25 @@ _ep_setstall:
346346
cmp r0, #0x80
347347
blo .L_eps_rx
348348
.L_eps_tx:
349-
ldr r0, =#TX_STALL //stall TX
349+
ldr r0, =TX_STALL //stall TX
350350
cmp r1, #0x00
351351
bne .L_eps_reg_set
352352
.L_eps_tx_unstall:
353-
ldr r0, =#DTX_USTALL //unstall dblbulk or iso TX (VALID and clr DTOG_TX & SWBUF_TX)
353+
ldr r0, =DTX_USTALL //unstall dblbulk or iso TX (VALID and clr DTOG_TX & SWBUF_TX)
354354
cmp r4, #0x01 // if doublebuffered bulk endpoint
355355
beq .L_eps_reg_set
356-
ldr r0, =#TX_USTALL // unstall other TX (NAKED + clr DTOG_TX)
356+
ldr r0, =TX_USTALL // unstall other TX (NAKED + clr DTOG_TX)
357357
b .L_eps_reg_set
358358
.L_eps_rx:
359359
lsls r2, #8 // RX_STAT_MASK -> R2
360-
ldr r0,=#RX_STALL //stall RX
360+
ldr r0,=RX_STALL //stall RX
361361
cmp r1, #0x00
362362
bne .L_eps_reg_set
363363
.L_eps_rx_unstall:
364-
ldr r0, =#DRX_USTALL //unstall dblbulk or iso (VALID. clr DTOG_RX set SWBUF_RX)
364+
ldr r0, =DRX_USTALL //unstall dblbulk or iso (VALID. clr DTOG_RX set SWBUF_RX)
365365
cmp r4, #0x01 // if dblbulk
366366
beq .L_eps_reg_set
367-
ldr r0, =#RX_USTALL // unstall other RX (VALID + clr
367+
ldr r0, =RX_USTALL // unstall other RX (VALID + clr
368368
/* R0 - mask and toggle bits
369369
* R2 - mask for STAT bits
370370
* R3 - endpoint register pointer
@@ -386,7 +386,7 @@ _ep_setstall:
386386
.type _ep_isstalled, %function
387387
/* bool ep_isstalled(uint8t ep) */
388388
_ep_isstalled:
389-
ldr r1, =#USB_EPBASE
389+
ldr r1, =USB_EPBASE
390390
lsls r2, r0, #28
391391
lsrs r2, #26
392392
ldr r1, [r1, r2]
@@ -414,8 +414,8 @@ _ep_isstalled:
414414
*/
415415
_ep_read:
416416
push {r4, r5, r6, lr}
417-
ldr r3, =#USB_EPBASE
418-
ldr r6, =#USB_PMABASE
417+
ldr r3, =USB_EPBASE
418+
ldr r6, =USB_PMABASE
419419
lsls r0, #28
420420
add r3, r3, r0, LSR #26 //*EPR -> R3
421421
add r4, r6, r0, LSR (28 - EPT_SHIFT) //*EPT -> R4
@@ -441,7 +441,7 @@ _ep_read:
441441
eors r0, r5, r5, LSR #8
442442
lsrs r0, #7 // SW_RX ^ DTOG_RX -> CF
443443
bcs .L_epr_notog // jmp if SW_RX != DTOG_RX (VALID)
444-
ldr r0, =#EP_NOTOG
444+
ldr r0, =EP_NOTOG
445445
ands r5, r0
446446
adds r5, #EP_RX_SWBUF
447447
strh r5, [r3] // toggling SW_RX
@@ -459,7 +459,6 @@ _ep_read:
459459
strh r5, [r4, #RXCOUNT]
460460
eors r0, r5 // r0 &= 0x3FF (RX count)
461461
ldrh r5, [r4, #RXADDR]
462-
// ldr r4, =USB_PMABASE
463462
adds r5, r4, r5, LSL (EPT_SHIFT - 3)
464463
cmp r2, r0
465464
blo .L_epr_read
@@ -484,7 +483,7 @@ _ep_read:
484483
beq .L_epr_exit // ep is iso. no needs to set it to valid
485484
cmp r1, #0x01
486485
beq .L_epr_exit // ep is dblbulk. no needs to set it to valid
487-
ldr r2, =#TGL_SET(EP_RX_STAT , EP_RX_VAL)
486+
ldr r2, =TGL_SET(EP_RX_STAT , EP_RX_VAL)
488487
eors r5, r2
489488
and r5, r5, r2, LSR #16
490489
strh r5, [r3] // set ep to VALID state
@@ -503,8 +502,8 @@ _ep_read:
503502
*/
504503
_ep_write:
505504
push {r4, r5, r6, lr}
506-
ldr r3, =#USB_EPBASE
507-
ldr r6, =#USB_PMABASE
505+
ldr r3, =USB_EPBASE
506+
ldr r6, =USB_PMABASE
508507
lsls r0, #28
509508
add r3, r3, r0, LSR #26 //*EPR -> R3
510509
add r4, r6, r0, LSR (28 - EPT_SHIFT) //*EPT -> R4
@@ -555,10 +554,10 @@ _ep_write:
555554
lsrs r1, #29
556555
cmp r1, #0x04
557556
beq .L_epw_exit // isochronous ep. do nothing
558-
ldr r2, =#TGL_SET(EP_TX_STAT, EP_TX_VAL)
557+
ldr r2, =TGL_SET(EP_TX_STAT, EP_TX_VAL)
559558
cmp r1, #0x01
560559
bne .L_epw_setstate // NOT a doublebuffered bulk
561-
ldr r2, =#TGL_SET(EP_TX_SWBUF, EP_TX_SWBUF)
560+
ldr r2, =TGL_SET(EP_TX_SWBUF, EP_TX_SWBUF)
562561
bics r5, r2 // clear TX_SWBUF
563562
.L_epw_setstate:
564563
eors r5, r2
@@ -577,8 +576,8 @@ _ep_write:
577576
_get_next_pma:
578577
push {r1, r3, r4, lr}
579578
movs r1, #16
580-
ldr r3, =#USB_PMASZ
581-
ldr r0, =#USB_PMABASE
579+
ldr r3, =USB_PMASZ
580+
ldr r0, =USB_PMABASE
582581
.L_gnp_chkaddr:
583582
ldrh r4, [r0, #0] //txaddr
584583
tst r4, r4
@@ -628,14 +627,14 @@ _ep_config:
628627
ands r4, r0
629628
orrs r3, r4
630629
lsls r4, #2
631-
ldr r5, =#USB_EPBASE
630+
ldr r5, =USB_EPBASE
632631
strh r3, [r5, r4] //setup EPTYPE EPKIND EPADDR
633632
cmp r1, #0x00 // is a control ep ?
634633
beq .L_epc_setuptx
635634
cmp r0, #0x80
636635
blo .L_epc_setuprx
637636
.L_epc_setuptx:
638-
ldr r5, =#USB_PMABASE
637+
ldr r5, =USB_PMABASE
639638
adds r5, r5, r4, LSL (EPT_SHIFT - 2)
640639
bl _get_next_pma
641640
bcc .L_epc_fail
@@ -644,18 +643,18 @@ _ep_config:
644643
strh r0, [r5, #TXCOUNT] //store txcnt
645644
cmp r1, #0x06 // is DBLBULK
646645
beq .L_epc_txdbl
647-
ldr r3, =#TX_USTALL //set state NAKED , clr DTOG_TX
646+
ldr r3, =TX_USTALL //set state NAKED , clr DTOG_TX
648647
cmp r1, #0x01 // is ISO
649648
bne .L_epc_txsetstate //
650649
.L_epc_txdbl:
651-
ldr r3, =#DTX_USTALL //set state VALID clr DTOG_TX & SWBUF_TX
650+
ldr r3, =DTX_USTALL //set state VALID clr DTOG_TX & SWBUF_TX
652651
bl _get_next_pma
653652
bcc .L_epc_fail
654653
strh r0, [r5, #TXADDR1] //store txaddr1
655654
movs r0, #0x00
656655
strh r0, [r5, #TXCOUNT1] //store txcnt
657656
.L_epc_txsetstate:
658-
ldr r5, =#USB_EPBASE
657+
ldr r5, =USB_EPBASE
659658
ldrh r0, [r5, r4]
660659
eors r0, r3
661660
lsrs r3, #16
@@ -674,14 +673,14 @@ _ep_config:
674673
adds r3, #0x3E
675674
.L_epc_rxbb:
676675
lsls r3, #9
677-
ldr r5, =#USB_PMABASE
676+
ldr r5, =USB_PMABASE
678677
adds r5, r5, r4, LSL (EPT_SHIFT - 2)
679678
/* RX or RX1 */
680679
bl _get_next_pma
681680
bcc .L_epc_fail
682681
strh r0, [r5, #RXADDR]
683682
strh r3, [r5, #RXCOUNT]
684-
ldr r0, =#RX_USTALL
683+
ldr r0, =RX_USTALL
685684
/* check if doublebuffered */
686685
cmp r1, 0x06 //if dblbulk
687686
beq .L_epc_rxdbl
@@ -692,9 +691,9 @@ _ep_config:
692691
bcc .L_epc_fail
693692
strh r0, [r5, #RXADDR0] //store rxaddr0
694693
strh r3, [r5, #RXCOUNT0] //store rxcnt0
695-
ldr r0, =#DRX_USTALL
694+
ldr r0, =DRX_USTALL
696695
.L_epc_rxsetstate:
697-
ldr r5, =#USB_EPBASE
696+
ldr r5, =USB_EPBASE
698697
ldrh r3, [r5, r4]
699698
eors r3, r0
700699
lsrs r0, #16
@@ -719,12 +718,12 @@ _ep_config:
719718
_ep_deconfig:
720719
lsls r1, r0, #28
721720
lsrs r1, #26
722-
ldr r2, =#USB_EPBASE
723-
ldr r3, =#USB_PMABASE
721+
ldr r2, =USB_EPBASE
722+
ldr r3, =USB_PMABASE
724723
adds r2, r1
725724
adds r3, r3, r1, LSL (EPT_SHIFT - 2)
726725
/* clearing endpoint register */
727-
ldr r1, =#EP_NOTOG
726+
ldr r1, =EP_NOTOG
728727
ldrh r0, [r2]
729728
bics r0, r1
730729
strh r0, [r2]
@@ -750,7 +749,7 @@ _ep_deconfig:
750749
/*void evt_poll(usbd_device *dev, usbd_evt_callback callback)*/
751750
_evt_poll:
752751
push {r0, r1, r4, r5}
753-
ldr r3, =#USB_REGBASE
752+
ldr r3, =USB_REGBASE
754753
ldrh r0, [r3, #4] //USB->ISTR -> R2
755754
/* ep_index -> R2 */
756755
movs r2, 0x07
@@ -776,7 +775,7 @@ _evt_poll:
776775

777776
.L_ep_ctrm:
778777
movs r5, #0x80 // CTR_TX mask to R5
779-
ldr r0,=#USB_EPBASE
778+
ldr r0,=USB_EPBASE
780779
add r0, r0, r2, LSL #2 // R0 ep register address
781780
ldrh r4, [r0] // R4 EPR valur
782781
lsrs r3, r4, #8 // CTR_TX -> CF
@@ -794,7 +793,7 @@ _evt_poll:
794793
movs r1, #usbd_evt_epsetup
795794
.L_ep_clr_ctr:
796795
bics r4, r5 //clear CTR flag
797-
ldr r5, =#EP_NOTOG
796+
ldr r5, =EP_NOTOG
798797
ands r4, r5
799798
strh r4, [r0] // store
800799
b .L_ep_callback
@@ -829,9 +828,9 @@ _evt_poll:
829828
/* do reset routine */
830829
.L_ep_resetm:
831830
movs r1, #7
832-
ldr r2, =#USB_EPBASE
833-
ldr r0, =#USB_PMABASE
834-
ldr r5, =#EP_NOTOG
831+
ldr r2, =USB_EPBASE
832+
ldr r0, =USB_PMABASE
833+
ldr r5, =EP_NOTOG
835834
.L_ep_reset_loop:
836835
ldrh r4, [r2]
837836
bics r4, r5

‎src/usbd_stm32l052_devfs_asm.S

+44-44
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ _get_serial_desc:
162162
.thumb_func
163163
.type _connect, %function
164164
_connect:
165-
ldr r3, =#USB_REGBASE
165+
ldr r3, =USB_REGBASE
166166
movs r1, #0x03 //BCDEN + DCDEN
167167
movs r2, #usbd_lane_dsc
168168
strh r1, [r3, #USB_BCDR]
@@ -206,7 +206,7 @@ _setaddr:
206206
.thumb_func
207207
.type _get_frame, %function
208208
_get_frame:
209-
ldr r0, =#USB_REGBASE
209+
ldr r0, =USB_REGBASE
210210
ldrh r0, [r0, #USB_FNR] //FNR
211211
lsls r0, #21
212212
lsrs r0, #21
@@ -216,8 +216,8 @@ _get_frame:
216216
.thumb_func
217217
.type _enable, %function
218218
_enable:
219-
ldr r1, =#USB_REGBASE //USB->CNTR
220-
ldr r2, =#RCC_BASE //RCC
219+
ldr r1, =USB_REGBASE //USB->CNTR
220+
ldr r2, =RCC_BASE //RCC
221221
movs r3, #0x01
222222
lsls r3, #RCC_USBEN //USBEN or USBRST
223223
tst r0, r0
@@ -238,7 +238,7 @@ _enable:
238238
orrs r0, r3
239239
str r0, [r2, #RCC_APB2ENR] //RCC->APB2ENR |= RCC_APB2ENR_SYSCFGCOMPEN
240240

241-
ldr r2, =#SYSCFG_BASE //SYSCFG->CFGR1
241+
ldr r2, =SYSCFG_BASE //SYSCFG->CFGR1
242242
ldr r0, [r2]
243243
lsls r3, #SYSCFG_USBREMAP
244244
orrs r0, r3
@@ -273,12 +273,12 @@ _enable:
273273
.type _getinfo, %function
274274
_getinfo:
275275
movs r0, #USBD_HW_BC
276-
ldr r2, =#RCC_BASE
276+
ldr r2, =RCC_BASE
277277
ldr r1, [r2, #RCC_APB1ENR]
278278
lsrs r1, #24 //USBEN -> CF
279279
bcc .L_getinfo_end
280280
adds r0, #USBD_HW_ENABLED
281-
ldr r2, =#USB_REGBASE
281+
ldr r2, =USB_REGBASE
282282
ldr r1, [r2, #USB_BCDR]
283283
lsrs r1, #15 //DPPU -> CF
284284
bcc .L_getinfo_end
@@ -297,7 +297,7 @@ _ep_setstall:
297297
push {r4, lr}
298298
lsls r2, r0, #28
299299
lsrs r2, #26
300-
ldr r3, =#USB_EPBASE
300+
ldr r3, =USB_EPBASE
301301
adds r3, r2 // epr -> r3
302302
movs r2, 0x30 // TX_STAT_MASK -> r2
303303
ldrh r4, [r3]
@@ -308,25 +308,25 @@ _ep_setstall:
308308
cmp r0, #0x80
309309
blo .L_eps_rx
310310
.L_eps_tx:
311-
ldr r0, =#TX_STALL //stall TX
311+
ldr r0, =TX_STALL //stall TX
312312
cmp r1, #0x00
313313
bne .L_eps_reg_set
314314
.L_eps_tx_unstall:
315-
ldr r0, =#DTX_USTALL //unstall dblbulk or iso TX (VALID and clr DTOG_TX & SWBUF_TX)
315+
ldr r0, =DTX_USTALL //unstall dblbulk or iso TX (VALID and clr DTOG_TX & SWBUF_TX)
316316
cmp r4, #0x01 // if doublebuffered bulk endpoint
317317
beq .L_eps_reg_set
318-
ldr r0, =#TX_USTALL // unstall other TX (NAKED + clr DTOG_TX)
318+
ldr r0, =TX_USTALL // unstall other TX (NAKED + clr DTOG_TX)
319319
b .L_eps_reg_set
320320
.L_eps_rx:
321321
lsls r2, #8 // RX_STAT_MASK -> R2
322-
ldr r0,=#RX_STALL //stall RX
322+
ldr r0,=RX_STALL //stall RX
323323
cmp r1, #0x00
324324
bne .L_eps_reg_set
325325
.L_eps_rx_unstall:
326-
ldr r0, =#DRX_USTALL //unstall dblbulk or iso (VALID. clr DTOG_RX set SWBUF_RX)
326+
ldr r0, =DRX_USTALL //unstall dblbulk or iso (VALID. clr DTOG_RX set SWBUF_RX)
327327
cmp r4, #0x01 // if dblbulk
328328
beq .L_eps_reg_set
329-
ldr r0, =#RX_USTALL // unstall other RX (VALID + clr
329+
ldr r0, =RX_USTALL // unstall other RX (VALID + clr
330330
/* R0 - mask and toggle bits
331331
* R2 - mask for STAT bits
332332
* R3 - endpoint register pointer
@@ -348,7 +348,7 @@ _ep_setstall:
348348
.type _ep_isstalled, %function
349349
/* bool ep_isstalled(uint8t ep) */
350350
_ep_isstalled:
351-
ldr r1, =#USB_EPBASE
351+
ldr r1, =USB_EPBASE
352352
lsls r2, r0, #28
353353
lsrs r2, #26
354354
ldr r1, [r1, r2]
@@ -376,8 +376,8 @@ _ep_isstalled:
376376
*/
377377
_ep_read:
378378
push {r4, r5, lr}
379-
ldr r3, =#USB_EPBASE
380-
ldr r4, =#USB_PMABASE
379+
ldr r3, =USB_EPBASE
380+
ldr r4, =USB_PMABASE
381381
lsls r0, #28
382382
lsrs r0, #26
383383
adds r3, r0 // *EPR -> R3
@@ -408,7 +408,7 @@ _ep_read:
408408
eors r0, r5
409409
lsrs r0, #7 // SW_RX ^ DTOG_RX -> CF
410410
bcs .L_epr_notog // jmp if SW_RX != DTOG_RX (VALID)
411-
ldr r0, =#EP_NOTOG
411+
ldr r0, =EP_NOTOG
412412
ands r5, r0
413413
adds r5, #EP_RX_SWBUF
414414
strh r5, [r3] // toggling SW_RX
@@ -427,7 +427,7 @@ _ep_read:
427427
lsls r0, #22
428428
lsrs r0, #22 // r0 &= 0x3FF (RX count)
429429
ldrh r5, [r4, #RXADDR]
430-
ldr r4, =#USB_PMABASE
430+
ldr r4, =USB_PMABASE
431431
adds r5, r4 // R5 now has a physical address
432432
cmp r2, r0
433433
blo .L_epr_read
@@ -452,7 +452,7 @@ _ep_read:
452452
beq .L_epr_exit // ep is iso. no needs to set it to valid
453453
cmp r1, #0x01
454454
beq .L_epr_exit // ep is dblbulk. no needs to set it to valid
455-
ldr r2, =#TGL_SET(EP_RX_STAT , EP_RX_VAL)
455+
ldr r2, =TGL_SET(EP_RX_STAT , EP_RX_VAL)
456456
eors r5, r2
457457
lsrs r2, #16
458458
ands r5, r2
@@ -473,8 +473,8 @@ _ep_read:
473473
*/
474474
_ep_write:
475475
push {r4, r5, r6, lr}
476-
ldr r3, =#USB_EPBASE
477-
ldr r4, =#USB_PMABASE
476+
ldr r3, =USB_EPBASE
477+
ldr r4, =USB_PMABASE
478478
lsls r0, #28
479479
lsrs r0, #26
480480
adds r3, r0 // *EPR -> R3
@@ -509,7 +509,7 @@ _ep_write:
509509
strh r2, [r4, #TXCOUNT]
510510
mov r0, r2 // save count for return
511511
ldrh r5, [r4, #TXADDR]
512-
ldr r4, =#USB_PMABASE
512+
ldr r4, =USB_PMABASE
513513
adds r5, r4 // PMA BUFFER -> R5
514514
.L_epw_write:
515515
cmp r2, #1
@@ -531,10 +531,10 @@ _ep_write:
531531
lsrs r1, #29
532532
cmp r1, #0x04
533533
beq .L_epw_exit // isochronous ep. do nothing
534-
ldr r2, =#TGL_SET(EP_TX_STAT, EP_TX_VAL)
534+
ldr r2, =TGL_SET(EP_TX_STAT, EP_TX_VAL)
535535
cmp r1, #0x01
536536
bne .L_epw_setstate // NOT a doublebuffered bulk
537-
ldr r2, =#TGL_SET(EP_TX_SWBUF, EP_TX_SWBUF)
537+
ldr r2, =TGL_SET(EP_TX_SWBUF, EP_TX_SWBUF)
538538
bics r5, r2 // clear TX_SWBUF
539539
.L_epw_setstate:
540540
eors r5, r2
@@ -554,7 +554,7 @@ _get_next_pma:
554554
movs r1, #0x3C
555555
movs r3, #1
556556
lsls r3, #10 //R3 MAX_PMA_SIZE
557-
ldr r0, =#USB_PMABASE
557+
ldr r0, =USB_PMABASE
558558
.L_gnp_chkaddr:
559559
ldrh r4, [r0, r1]
560560
tst r4, r4
@@ -604,14 +604,14 @@ _ep_config:
604604
lsrs r4, #28
605605
orrs r3, r4
606606
lsls r4, #2
607-
ldr r5, =#USB_EPBASE
607+
ldr r5, =USB_EPBASE
608608
strh r3, [r5, r4] //setup EPTYPE EPKIND EPADDR
609609
cmp r1, #0x00 // is a control ep ?
610610
beq .L_epc_setuptx
611611
cmp r0, #0x80
612612
blo .L_epc_setuprx
613613
.L_epc_setuptx:
614-
ldr r5, =#USB_PMABASE
614+
ldr r5, =USB_PMABASE
615615
lsls r4, #1
616616
adds r5, r4
617617
/* setup buffer table */
@@ -623,19 +623,19 @@ _ep_config:
623623
strh r0, [r5, #TXCOUNT] //store txcnt
624624
cmp r1, #0x06 // is DBLBULK
625625
beq .L_epc_txdbl
626-
ldr r3, =#TX_USTALL //set state NAKED , clr DTOG_TX
626+
ldr r3, =TX_USTALL //set state NAKED , clr DTOG_TX
627627
cmp r1, #0x01
628628
bne .L_epc_txsetstate //if single buffered
629629
.L_epc_txdbl:
630630
/* TX1 */
631-
ldr r3, =#DTX_USTALL //set state VALID clr DTOG_TX & SWBUF_TX
631+
ldr r3, =DTX_USTALL //set state VALID clr DTOG_TX & SWBUF_TX
632632
bl _get_next_pma
633633
bcc .L_epc_fail
634634
strh r0, [r5, #TXADDR1] //store txaddr1
635635
movs r0, #0x00
636636
strh r0, [r5, #TXCOUNT1] //store txcnt
637637
.L_epc_txsetstate:
638-
ldr r5, =#USB_EPBASE
638+
ldr r5, =USB_EPBASE
639639
lsrs r4, #1
640640
ldrh r0, [r5, r4]
641641
eors r0, r3
@@ -657,7 +657,7 @@ _ep_config:
657657
adds r3, #0x3E
658658
.L_epc_rxbb:
659659
lsls r3, #9
660-
ldr r5, =#USB_PMABASE
660+
ldr r5, =USB_PMABASE
661661
lsls r4, #1
662662
adds r5, r4
663663
/* setup buffer table */
@@ -666,7 +666,7 @@ _ep_config:
666666
/* set RX or RX1 */
667667
strh r0, [r5, #RXADDR]
668668
strh r3, [r5, #RXCOUNT]
669-
ldr r0, =#RX_USTALL
669+
ldr r0, =RX_USTALL
670670
/* check if doublebuffered */
671671
cmp r1, 0x06 //if dblbulk
672672
beq .L_epc_rxdbl
@@ -677,9 +677,9 @@ _ep_config:
677677
bcc .L_epc_fail
678678
strh r0, [r5, #RXADDR0] //store rxaddr0
679679
strh r3, [r5, #RXCOUNT0] //store rxcnt0
680-
ldr r0, =#DRX_USTALL
680+
ldr r0, =DRX_USTALL
681681
.L_epc_rxsetstate:
682-
ldr r5, =#USB_EPBASE
682+
ldr r5, =USB_EPBASE
683683
lsrs r4, #1
684684
ldrh r3, [r5, r4]
685685
eors r3, r0
@@ -705,13 +705,13 @@ _ep_config:
705705
_ep_deconfig:
706706
lsls r1, r0, #28
707707
lsrs r1, #26
708-
ldr r2, =#USB_EPBASE
709-
ldr r3, =#USB_PMABASE
708+
ldr r2, =USB_EPBASE
709+
ldr r3, =USB_PMABASE
710710
adds r2, r1
711711
lsls r1, #1
712712
adds r3, r1
713713
/* clearing endpoint register */
714-
ldr r1, =#EP_NOTOG
714+
ldr r1, =EP_NOTOG
715715
ldrh r0, [r2]
716716
bics r0, r1
717717
strh r0, [r2]
@@ -734,7 +734,7 @@ _ep_deconfig:
734734
/*void evt_poll(usbd_device *dev, usbd_evt_callback callback)*/
735735
_evt_poll:
736736
push {r0, r1, r4, r5}
737-
ldr r3, =#USB_REGBASE
737+
ldr r3, =USB_REGBASE
738738
ldrh r0, [r3, #4] //USB->ISTR -> R2
739739
/* ep_index -> R2 */
740740
movs r2, 0x07
@@ -760,7 +760,7 @@ _evt_poll:
760760

761761
.L_ep_ctrm:
762762
movs r5, #0x80 // CTR_TX mask to R5
763-
ldr r0,=#USB_EPBASE
763+
ldr r0,=USB_EPBASE
764764
lsrs r0, #2
765765
adds r0, r2
766766
lsls r0, #2 // R0 ep register address
@@ -780,7 +780,7 @@ _evt_poll:
780780
movs r1, #usbd_evt_epsetup
781781
.L_ep_clr_ctr:
782782
bics r4, r5 //clear CTR flag
783-
ldr r5, =#EP_NOTOG
783+
ldr r5, =EP_NOTOG
784784
ands r4, r5
785785
strh r4, [r0] // store
786786
b .L_ep_callback
@@ -814,9 +814,9 @@ _evt_poll:
814814
/* do reset routine */
815815
.L_ep_resetm:
816816
movs r1, #7
817-
ldr r2, =#USB_EPBASE
818-
ldr r0, =#USB_PMABASE
819-
ldr r5, =#EP_NOTOG
817+
ldr r2, =USB_EPBASE
818+
ldr r0, =USB_PMABASE
819+
ldr r5, =EP_NOTOG
820820
.L_ep_reset_loop:
821821
ldrh r4, [r2]
822822
bics r4, r5

‎src/usbd_stm32l100_devfs_asm.S

+44-44
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ _get_serial_desc:
161161
.thumb_func
162162
.type _connect, %function
163163
_connect:
164-
ldr r1, =#SYSCFG_BASE
164+
ldr r1, =SYSCFG_BASE
165165
movs r3, #0x01
166166
ldr r2, [r1, #SYSCFG_PMC]
167167
bics r2, r3
@@ -177,12 +177,12 @@ _connect:
177177
.type _getinfo, %function
178178
_getinfo:
179179
movs r0, 0
180-
ldr r2, =#RCC_BASE
180+
ldr r2, =RCC_BASE
181181
ldr r1, [r2, #RCC_APB1ENR]
182182
lsrs r1, #24 //USBEN -> CF
183183
bcc .L_getinfo_end
184184
adds r0, #USBD_HW_ENABLED
185-
ldr r2, =#SYSCFG_BASE
185+
ldr r2, =SYSCFG_BASE
186186
ldr r1, [r2, #SYSCFG_PMC]
187187
lsrs r1, #1 //PU -> CF
188188
bcc .L_getinfo_end
@@ -203,7 +203,7 @@ _setaddr:
203203
.thumb_func
204204
.type _get_frame, %function
205205
_get_frame:
206-
ldr r0, =#USB_REGBASE
206+
ldr r0, =USB_REGBASE
207207
ldrh r0, [r0, #USB_FNR] //FNR
208208
lsls r0, #21
209209
lsrs r0, #21
@@ -213,13 +213,13 @@ _get_frame:
213213
.thumb_func
214214
.type _enable, %function
215215
_enable:
216-
ldr r2, =#RCC_BASE //RCC
216+
ldr r2, =RCC_BASE //RCC
217217
movs r3, #0x01
218218
lsls r3, #23 //USBEN or USBRST
219219
cbz r0, .L_disable
220220
.L_enable:
221221
/* enabling and resetting USB peripheral */
222-
ldr r1, =#USB_REGBASE
222+
ldr r1, =USB_REGBASE
223223
ldr r0, [r2, #RCC_APB1ENR]
224224
orrs r0, r3
225225
str r0, [r2, #RCC_APB1ENR] //RCC->APB1ENR |= USBEN
@@ -251,7 +251,7 @@ _enable:
251251
str r0, [r2, #RCC_APB1ENR]
252252
/* disabling USB_PU in SYSCFG_PMC */
253253
movs r3, #0x01
254-
ldr r1, =#SYSCFG_BASE
254+
ldr r1, =SYSCFG_BASE
255255
ldr r0, [r1, #SYSCFG_PMC]
256256
bics r0, r3
257257
str r0, [r1, #SYSCFG_PMC]
@@ -271,7 +271,7 @@ _ep_setstall:
271271
push {r4, lr}
272272
lsls r2, r0, #28
273273
lsrs r2, #26
274-
ldr r3, =#USB_EPBASE
274+
ldr r3, =USB_EPBASE
275275
adds r3, r2 // epr -> r3
276276
movs r2, 0x30 // TX_STAT_MASK -> r2
277277
ldrh r4, [r3]
@@ -282,25 +282,25 @@ _ep_setstall:
282282
cmp r0, #0x80
283283
blo .L_eps_rx
284284
.L_eps_tx:
285-
ldr r0, =#TX_STALL //stall TX
285+
ldr r0, =TX_STALL //stall TX
286286
cmp r1, #0x00
287287
bne .L_eps_reg_set
288288
.L_eps_tx_unstall:
289-
ldr r0, =#DTX_USTALL //unstall dblbulk or iso TX (VALID and clr DTOG_TX & SWBUF_TX)
289+
ldr r0, =DTX_USTALL //unstall dblbulk or iso TX (VALID and clr DTOG_TX & SWBUF_TX)
290290
cmp r4, #0x01 // if doublebuffered bulk endpoint
291291
beq .L_eps_reg_set
292-
ldr r0, =#TX_USTALL // unstall other TX (NAKED + clr DTOG_TX)
292+
ldr r0, =TX_USTALL // unstall other TX (NAKED + clr DTOG_TX)
293293
b .L_eps_reg_set
294294
.L_eps_rx:
295295
lsls r2, #8 // RX_STAT_MASK -> R2
296-
ldr r0,=#RX_STALL //stall RX
296+
ldr r0,=RX_STALL //stall RX
297297
cmp r1, #0x00
298298
bne .L_eps_reg_set
299299
.L_eps_rx_unstall:
300-
ldr r0, =#DRX_USTALL //unstall dblbulk or iso (VALID. clr DTOG_RX set SWBUF_RX)
300+
ldr r0, =DRX_USTALL //unstall dblbulk or iso (VALID. clr DTOG_RX set SWBUF_RX)
301301
cmp r4, #0x01 // if dblbulk
302302
beq .L_eps_reg_set
303-
ldr r0, =#RX_USTALL // unstall other RX (VALID + clr
303+
ldr r0, =RX_USTALL // unstall other RX (VALID + clr
304304
/* R0 - mask and toggle bits
305305
* R2 - mask for STAT bits
306306
* R3 - endpoint register pointer
@@ -322,7 +322,7 @@ _ep_setstall:
322322
.type _ep_isstalled, %function
323323
/* bool ep_isstalled(uint8t ep) */
324324
_ep_isstalled:
325-
ldr r1, =#USB_EPBASE
325+
ldr r1, =USB_EPBASE
326326
lsls r2, r0, #28
327327
lsrs r2, #26
328328
ldr r1, [r1, r2]
@@ -350,8 +350,8 @@ _ep_isstalled:
350350
*/
351351
_ep_read:
352352
push {r4, r5, lr}
353-
ldr r3, =#USB_EPBASE
354-
ldr r4, =#USB_PMABASE
353+
ldr r3, =USB_EPBASE
354+
ldr r4, =USB_PMABASE
355355
lsls r0, #28
356356
lsrs r0, #26
357357
adds r3, r0 // *EPR -> R3
@@ -382,7 +382,7 @@ _ep_read:
382382
eors r0, r5
383383
lsrs r0, #7 // SW_RX ^ DTOG_RX -> CF
384384
bcs .L_epr_notog // jmp if SW_RX != DTOG_RX (VALID)
385-
ldr r0, =#EP_NOTOG
385+
ldr r0, =EP_NOTOG
386386
ands r5, r0
387387
adds r5, #EP_RX_SWBUF
388388
strh r5, [r3] // toggling SW_RX
@@ -401,7 +401,7 @@ _ep_read:
401401
lsls r0, #22
402402
lsrs r0, #22 // r0 &= 0x3FF (RX count)
403403
ldrh r5, [r4, #RXADDR]
404-
ldr r4, =#USB_PMABASE
404+
ldr r4, =USB_PMABASE
405405
lsls r5, #0x01
406406
adds r5, r4 // R5 now has a physical address
407407
cmp r2, r0
@@ -427,7 +427,7 @@ _ep_read:
427427
beq .L_epr_exit // ep is iso. no needs to set it to valid
428428
cmp r1, #0x01
429429
beq .L_epr_exit // ep is dblbulk. no needs to set it to valid
430-
ldr r2, =#TGL_SET(EP_RX_STAT , EP_RX_VAL)
430+
ldr r2, =TGL_SET(EP_RX_STAT , EP_RX_VAL)
431431
eors r5, r2
432432
lsrs r2, #16
433433
ands r5, r2
@@ -447,8 +447,8 @@ _ep_read:
447447
*/
448448
_ep_write:
449449
push {r4, r5, r6, lr}
450-
ldr r3, =#USB_EPBASE
451-
ldr r4, =#USB_PMABASE
450+
ldr r3, =USB_EPBASE
451+
ldr r4, =USB_PMABASE
452452
lsls r0, #28
453453
lsrs r0, #26
454454
adds r3, r0 // *EPR -> R3
@@ -483,7 +483,7 @@ _ep_write:
483483
strh r2, [r4, #TXCOUNT]
484484
mov r0, r2 // save count for return
485485
ldrh r5, [r4, #TXADDR]
486-
ldr r4, =#USB_PMABASE
486+
ldr r4, =USB_PMABASE
487487
lsls r5, #1
488488
adds r5, r4 // PMA BUFFER -> R5
489489
.L_epw_write:
@@ -506,10 +506,10 @@ _ep_write:
506506
lsrs r1, #29
507507
cmp r1, #0x04
508508
beq .L_epw_exit // isochronous ep. do nothing
509-
ldr r2, =#TGL_SET(EP_TX_STAT, EP_TX_VAL)
509+
ldr r2, =TGL_SET(EP_TX_STAT, EP_TX_VAL)
510510
cmp r1, #0x01
511511
bne .L_epw_setstate // NOT a doublebuffered bulk
512-
ldr r2, =#TGL_SET(EP_TX_SWBUF, EP_TX_SWBUF)
512+
ldr r2, =TGL_SET(EP_TX_SWBUF, EP_TX_SWBUF)
513513
bics r5, r2 // clear TX_SWBUF
514514
.L_epw_setstate:
515515
eors r5, r2
@@ -531,7 +531,7 @@ _get_next_pma:
531531
movs r1, #16
532532
movs r3, #1
533533
lsls r3, #9 //R3 MAX_PMA_SIZE 512b
534-
ldr r0, =#USB_PMABASE
534+
ldr r0, =USB_PMABASE
535535
.L_gnp_chkaddr:
536536
ldrh r4, [r0, #0] //txaddr
537537
tst r4, r4
@@ -585,14 +585,14 @@ _ep_config:
585585
lsrs r4, #28
586586
orrs r3, r4
587587
lsls r4, #2
588-
ldr r5, =#USB_EPBASE
588+
ldr r5, =USB_EPBASE
589589
strh r3, [r5, r4] //setup EPTYPE EPKIND EPADDR
590590
cmp r1, #0x00 // is a control ep ?
591591
beq .L_epc_setuptx
592592
cmp r0, #0x80
593593
blo .L_epc_setuprx
594594
.L_epc_setuptx:
595-
ldr r5, =#USB_PMABASE
595+
ldr r5, =USB_PMABASE
596596
lsls r4, #2
597597
adds r5, r4
598598
bl _get_next_pma
@@ -602,18 +602,18 @@ _ep_config:
602602
strh r0, [r5, #TXCOUNT] //store txcnt
603603
cmp r1, #0x06 // is DBLBULK
604604
beq .L_epc_txdbl
605-
ldr r3, =#TX_USTALL //set state NAKED , clr DTOG_TX
605+
ldr r3, =TX_USTALL //set state NAKED , clr DTOG_TX
606606
cmp r1, #0x01 // is ISO
607607
bne .L_epc_txsetstate //
608608
.L_epc_txdbl:
609-
ldr r3, =#DTX_USTALL //set state VALID clr DTOG_TX & SWBUF_TX
609+
ldr r3, =DTX_USTALL //set state VALID clr DTOG_TX & SWBUF_TX
610610
bl _get_next_pma
611611
bcc .L_epc_fail
612612
strh r0, [r5, #TXADDR1] //store txaddr1
613613
movs r0, #0x00
614614
strh r0, [r5, #TXCOUNT1] //store txcnt
615615
.L_epc_txsetstate:
616-
ldr r5, =#USB_EPBASE
616+
ldr r5, =USB_EPBASE
617617
lsrs r4, #2
618618
ldrh r0, [r5, r4]
619619
eors r0, r3
@@ -633,15 +633,15 @@ _ep_config:
633633
adds r3, #0x3E
634634
.L_epc_rxbb:
635635
lsls r3, #9
636-
ldr r5, =#USB_PMABASE
636+
ldr r5, =USB_PMABASE
637637
lsls r4, #2
638638
adds r5, r4
639639
/* RX or RX1 */
640640
bl _get_next_pma
641641
bcc .L_epc_fail
642642
strh r0, [r5, #RXADDR]
643643
strh r3, [r5, #RXCOUNT]
644-
ldr r0, =#RX_USTALL
644+
ldr r0, =RX_USTALL
645645
/* check if doublebuffered */
646646
cmp r1, 0x06 //if dblbulk
647647
beq .L_epc_rxdbl
@@ -652,9 +652,9 @@ _ep_config:
652652
bcc .L_epc_fail
653653
strh r0, [r5, #RXADDR0] //store rxaddr0
654654
strh r3, [r5, #RXCOUNT0] //store rxcnt0
655-
ldr r0, =#DRX_USTALL
655+
ldr r0, =DRX_USTALL
656656
.L_epc_rxsetstate:
657-
ldr r5, =#USB_EPBASE
657+
ldr r5, =USB_EPBASE
658658
lsrs r4, #2
659659
ldrh r3, [r5, r4]
660660
eors r3, r0
@@ -680,13 +680,13 @@ _ep_config:
680680
_ep_deconfig:
681681
lsls r1, r0, #28
682682
lsrs r1, #26
683-
ldr r2, =#USB_EPBASE
684-
ldr r3, =#USB_PMABASE
683+
ldr r2, =USB_EPBASE
684+
ldr r3, =USB_PMABASE
685685
adds r2, r1
686686
lsls r1, #1
687687
adds r3, r1
688688
/* clearing endpoint register */
689-
ldr r1, =#EP_NOTOG
689+
ldr r1, =EP_NOTOG
690690
ldrh r0, [r2]
691691
bics r0, r1
692692
strh r0, [r2]
@@ -712,7 +712,7 @@ _ep_deconfig:
712712
/*void evt_poll(usbd_device *dev, usbd_evt_callback callback)*/
713713
_evt_poll:
714714
push {r0, r1, r4, r5}
715-
ldr r3, =#USB_REGBASE
715+
ldr r3, =USB_REGBASE
716716
ldrh r0, [r3, #4] //USB->ISTR -> R2
717717
/* ep_index -> R2 */
718718
movs r2, 0x07
@@ -738,7 +738,7 @@ _evt_poll:
738738

739739
.L_ep_ctrm:
740740
movs r5, #0x80 // CTR_TX mask to R5
741-
ldr r0,=#USB_EPBASE
741+
ldr r0,=USB_EPBASE
742742
lsrs r0, #2
743743
adds r0, r2
744744
lsls r0, #2 // R0 ep register address
@@ -758,7 +758,7 @@ _evt_poll:
758758
movs r1, #usbd_evt_epsetup
759759
.L_ep_clr_ctr:
760760
bics r4, r5 //clear CTR flag
761-
ldr r5, =#EP_NOTOG
761+
ldr r5, =EP_NOTOG
762762
ands r4, r5
763763
strh r4, [r0] // store
764764
b .L_ep_callback
@@ -793,9 +793,9 @@ _evt_poll:
793793
/* do reset routine */
794794
.L_ep_resetm:
795795
movs r1, #7
796-
ldr r2, =#USB_EPBASE
797-
ldr r0, =#USB_PMABASE
798-
ldr r5, =#EP_NOTOG
796+
ldr r2, =USB_EPBASE
797+
ldr r0, =USB_PMABASE
798+
ldr r5, =EP_NOTOG
799799
.L_ep_reset_loop:
800800
ldrh r4, [r2]
801801
bics r4, r5

0 commit comments

Comments
 (0)
Please sign in to comment.