projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build: Fix incorrect build target for Ubuntu CI builds.
[pub/USBasp.git]
/
LUFA
/
Drivers
/
Board
/
AVR8
/
YUN
/
LEDs.h
diff --git
a/LUFA/Drivers/Board/AVR8/YUN/LEDs.h
b/LUFA/Drivers/Board/AVR8/YUN/LEDs.h
index
f916d10
..
de1493b
100644
(file)
--- a/
LUFA/Drivers/Board/AVR8/YUN/LEDs.h
+++ b/
LUFA/Drivers/Board/AVR8/YUN/LEDs.h
@@
-1,13
+1,13
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 201
4
.
+ Copyright (C) Dean Camera, 201
9
.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
- Copyright 201
4
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 201
9
Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
@@
-46,14
+46,14
@@
* <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
* <tr><td>LEDS_LED1</td><td>Yellow</td><td>RX</td><td>Low</td><td>PORTB.0</td></tr>
* <tr><td>LEDS_LED2</td><td>Yellow</td><td>TX</td><td>Low</td><td>PORTD.5</td></tr>
* <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
* <tr><td>LEDS_LED1</td><td>Yellow</td><td>RX</td><td>Low</td><td>PORTB.0</td></tr>
* <tr><td>LEDS_LED2</td><td>Yellow</td><td>TX</td><td>Low</td><td>PORTD.5</td></tr>
- * <tr><td>LEDS_LED
1
</td><td>Red</td><td>General Indicator</td><td>High</td><td>PORTC.7</td></tr>
+ * <tr><td>LEDS_LED
3
</td><td>Red</td><td>General Indicator</td><td>High</td><td>PORTC.7</td></tr>
* </table>
*
* @{
*/
* </table>
*
* @{
*/
-#ifndef __LEDS_
LEONARDO
_H__
-#define __LEDS_
LEONARDO
_H__
+#ifndef __LEDS_
YUN
_H__
+#define __LEDS_
YUN
_H__
/* Includes: */
#include "../../../../Common/Common.h"
/* Includes: */
#include "../../../../Common/Common.h"
@@
-98,9
+98,9
@@
static inline void LEDs_Init(void)
{
DDRB |= LEDS_PORTB_LEDS;
static inline void LEDs_Init(void)
{
DDRB |= LEDS_PORTB_LEDS;
- PORTB
&
= LEDS_PORTB_LEDS;
+ PORTB
|
= LEDS_PORTB_LEDS;
DDRD |= LEDS_PORTD_LEDS;
DDRD |= LEDS_PORTD_LEDS;
- PORTD
&
= LEDS_PORTD_LEDS;
+ PORTD
|
= LEDS_PORTD_LEDS;
DDRC |= LEDS_PORTC_LEDS;
PORTC &= ~LEDS_PORTC_LEDS;
}
DDRC |= LEDS_PORTC_LEDS;
PORTC &= ~LEDS_PORTC_LEDS;
}
@@
-117,44
+117,44
@@
static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
{
static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
{
- PORTB
|=
(LEDMask & LEDS_PORTB_LEDS);
- PORTD
|=
(LEDMask & LEDS_PORTD_LEDS);
+ PORTB
&= ~
(LEDMask & LEDS_PORTB_LEDS);
+ PORTD
&= ~
(LEDMask & LEDS_PORTD_LEDS);
PORTC |= (LEDMask & LEDS_PORTC_LEDS);
}
static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
{
PORTC |= (LEDMask & LEDS_PORTC_LEDS);
}
static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
{
- PORTB
&= ~
(LEDMask & LEDS_PORTB_LEDS);
- PORTD
&= ~
(LEDMask & LEDS_PORTD_LEDS);
+ PORTB
|=
(LEDMask & LEDS_PORTB_LEDS);
+ PORTD
|=
(LEDMask & LEDS_PORTD_LEDS);
PORTC &= ~(LEDMask & LEDS_PORTC_LEDS);
}
static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
{
PORTC &= ~(LEDMask & LEDS_PORTC_LEDS);
}
static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
{
- PORTB = ((PORTB
& ~LEDS_PORTB_LEDS) |
(LEDMask & LEDS_PORTB_LEDS));
- PORTD = ((PORTD
& ~LEDS_PORTD_LEDS) |
(LEDMask & LEDS_PORTD_LEDS));
+ PORTB = ((PORTB
| LEDS_PORTB_LEDS) & ~
(LEDMask & LEDS_PORTB_LEDS));
+ PORTD = ((PORTD
| LEDS_PORTD_LEDS) & ~
(LEDMask & LEDS_PORTD_LEDS));
PORTC = ((PORTC & ~LEDS_PORTC_LEDS) | (LEDMask & LEDS_PORTC_LEDS));
}
static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
const uint8_t ActiveMask)
{
PORTC = ((PORTC & ~LEDS_PORTC_LEDS) | (LEDMask & LEDS_PORTC_LEDS));
}
static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
const uint8_t ActiveMask)
{
- PORTB = ((PORTB
& ~(LEDMask & LEDS_PORTB_LEDS)) |
(ActiveMask & LEDS_PORTB_LEDS));
- PORTD = ((PORTD
& ~(LEDMask & LEDS_PORTD_LEDS)) |
(ActiveMask & LEDS_PORTD_LEDS));
- PORTC = ((PORTC & ~(LEDMask & LEDS_PORTC_LEDS)) | (ActiveMask & LEDS_PORTC_LEDS));
+ PORTB = ((PORTB
| (LEDMask & LEDS_PORTB_LEDS)) & ~
(ActiveMask & LEDS_PORTB_LEDS));
+ PORTD = ((PORTD
| (LEDMask & LEDS_PORTD_LEDS)) & ~
(ActiveMask & LEDS_PORTD_LEDS));
+ PORTC = ((PORTC & ~(LEDMask & LEDS_PORTC_LEDS)) |
(ActiveMask & LEDS_PORTC_LEDS));
}
static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
{
}
static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
{
- P
ORTB ^
= (LEDMask & LEDS_PORTB_LEDS);
- P
ORTD ^
= (LEDMask & LEDS_PORTD_LEDS);
- P
ORTC ^
= (LEDMask & LEDS_PORTC_LEDS);
+ P
INB
= (LEDMask & LEDS_PORTB_LEDS);
+ P
IND
= (LEDMask & LEDS_PORTD_LEDS);
+ P
INC
= (LEDMask & LEDS_PORTC_LEDS);
}
static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t LEDs_GetLEDs(void)
{
}
static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t LEDs_GetLEDs(void)
{
- return ((
PORTB & LEDS_PORTB_LEDS) | (
PORTD & LEDS_PORTD_LEDS) | (PORTC & LEDS_PORTC_LEDS));
+ return ((
~PORTB & LEDS_PORTB_LEDS) | (~
PORTD & LEDS_PORTD_LEDS) | (PORTC & LEDS_PORTC_LEDS));
}
#endif
}
#endif