File tree Expand file tree Collapse file tree 2 files changed +12
-27
lines changed Expand file tree Collapse file tree 2 files changed +12
-27
lines changed Original file line number Diff line number Diff line change @@ -508,28 +508,15 @@ macro_rules! dma_stream {
508
508
} ;
509
509
}
510
510
511
-
512
511
dma_stream ! (
513
512
// Note: the field names start from one, unlike the RM where they start from
514
513
// zero. May need updating if it gets fixed upstream.
515
- (
516
- Stream0 , 0 , 1
517
- ) ,
518
- (
519
- Stream1 , 1 , 2
520
- ) ,
521
- (
522
- Stream2 , 2 , 3
523
- ) ,
524
- (
525
- Stream3 , 3 , 4
526
- ) ,
527
- (
528
- Stream4 , 4 , 5
529
- ) ,
530
- (
531
- Stream5 , 5 , 6
532
- ) ,
514
+ ( Stream0 , 0 , 1 ) ,
515
+ ( Stream1 , 1 , 2 ) ,
516
+ ( Stream2 , 2 , 3 ) ,
517
+ ( Stream3 , 3 , 4 ) ,
518
+ ( Stream4 , 4 , 5 ) ,
519
+ ( Stream5 , 5 , 6 ) ,
533
520
) ;
534
521
535
522
// Cat 3 and 4 devices
@@ -545,10 +532,6 @@ dma_stream!(
545
532
dma_stream ! (
546
533
// Note: the field names start from one, unlike the RM where they start from
547
534
// zero. May need updating if it gets fixed upstream.
548
- (
549
- Stream6 , 6 , 7
550
- ) ,
551
- (
552
- Stream7 , 7 , 8
553
- ) ,
535
+ ( Stream6 , 6 , 7 ) ,
536
+ ( Stream7 , 7 , 8 ) ,
554
537
) ;
Original file line number Diff line number Diff line change @@ -93,7 +93,7 @@ impl IndependentWatchdog {
93
93
}
94
94
self . iwdg
95
95
. winr ( )
96
- . write ( |w| unsafe { w. win ( ) . bits ( Self :: MAX_COUNTER_VALUE as u16 ) } ) ;
96
+ . write ( |w| unsafe { w. win ( ) . bits ( Self :: MAX_COUNTER_VALUE as u16 ) } ) ;
97
97
98
98
// Calculate the counter values
99
99
let reload_value = max_window_time. to_millis ( ) * ( Self :: CLOCK_SPEED / 1000 )
@@ -105,7 +105,9 @@ impl IndependentWatchdog {
105
105
while self . iwdg . sr ( ) . read ( ) . rvu ( ) . bit_is_set ( ) {
106
106
cortex_m:: asm:: nop ( ) ;
107
107
}
108
- self . iwdg . rlr ( ) . write ( |w| unsafe { w. rl ( ) . bits ( reload_value as u16 ) } ) ;
108
+ self . iwdg
109
+ . rlr ( )
110
+ . write ( |w| unsafe { w. rl ( ) . bits ( reload_value as u16 ) } ) ;
109
111
110
112
self . feed ( ) ;
111
113
// Enable register access
You can’t perform that action at this time.
0 commit comments