Skip to content

Commit cf02331

Browse files
committed
Move power.h and eeprom.h patches into patches
1 parent 26d5bd0 commit cf02331

File tree

3 files changed

+114
-442
lines changed

3 files changed

+114
-442
lines changed

avr-libc-patches/02-power.patch

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
--- a/include/avr/power.h 2020-05-26 14:04:10.000000000 +0200
2+
+++ b/include/avr/power.h 2020-05-26 11:29:38.153645260 +0200
3+
@@ -689,6 +689,11 @@
4+
#define power_spi_disable() (PRR0 |= (uint8_t)(1 << PRSPI))
5+
#endif
6+
7+
+#if defined(__AVR_HAVE_PRR0_PRSPI0)
8+
+#define power_spi_enable() (PRR0 &= (uint8_t)~(1 << PRSPI0))
9+
+#define power_spi_disable() (PRR0 |= (uint8_t)(1 << PRSPI0))
10+
+#endif
11+
+
12+
#if defined(__AVR_HAVE_PRR0_PRT0)
13+
#define power_timer0_enable() (PRR0 &= (uint8_t)~(1 << PRT0))
14+
#define power_timer0_disable() (PRR0 |= (uint8_t)(1 << PRT0))
15+
@@ -734,6 +739,11 @@
16+
#define power_twi_disable() (PRR0 |= (uint8_t)(1 << PRTWI))
17+
#endif
18+
19+
+#if defined(__AVR_HAVE_PRR0_PRTWI0)
20+
+#define power_twi_enable() (PRR0 &= (uint8_t)~(1 << PRTWI0))
21+
+#define power_twi_disable() (PRR0 |= (uint8_t)(1 << PRTWI0))
22+
+#endif
23+
+
24+
#if defined(__AVR_HAVE_PRR0_PRTWI1)
25+
#define power_twi1_enable() (PRR0 &= (uint8_t)~(1 << PRTWI1))
26+
#define power_twi1_disable() (PRR0 |= (uint8_t)(1 << PRTWI1))
27+
@@ -814,6 +824,11 @@
28+
#define power_spi_disable() (PRR1 |= (uint8_t)(1 << PRSPI))
29+
#endif
30+
31+
+#if defined(__AVR_HAVE_PRR1_PRSPI1)
32+
+#define power_spi1_enable() (PRR1 &= (uint8_t)~(1 << PRSPI1))
33+
+#define power_spi1_disable() (PRR1 |= (uint8_t)(1 << PRSPI1))
34+
+#endif
35+
+
36+
#if defined(__AVR_HAVE_PRR1_PRT1)
37+
#define power_timer1_enable() (PRR1 &= (uint8_t)~(1 << PRT1))
38+
#define power_timer1_disable() (PRR1 |= (uint8_t)(1 << PRT1))
39+
@@ -859,6 +874,11 @@
40+
#define power_transceiver_disable() (PRR1 |= (uint8_t)(1 << PRTRX24))
41+
#endif
42+
43+
+#if defined(__AVR_HAVE_PRR1_PRTWI1)
44+
+#define power_twi1_enable() (PRR1 &= (uint8_t)~(1 << PRTWI1))
45+
+#define power_twi1_disable() (PRR1 |= (uint8_t)(1 << PRTWI1))
46+
+#endif
47+
+
48+
#if defined(__AVR_HAVE_PRR1_PRUSART1)
49+
#define power_usart1_enable() (PRR1 &= (uint8_t)~(1 << PRUSART1))
50+
#define power_usart1_disable() (PRR1 |= (uint8_t)(1 << PRUSART1))
51+
@@ -924,6 +944,11 @@
52+
#define power_preamble_rssi_fifo_disable() (PRR2 |= (uint8_t)(1 << PRSF))
53+
#endif
54+
55+
+#if defined(__AVR_HAVE_PRR2_PRSPI1)
56+
+#define power_spi1_enable() (PRR2 &= (uint8_t)~(1 << PRSPI1))
57+
+#define power_spi1_disable() (PRR2 |= (uint8_t)(1 << PRSPI1))
58+
+#endif
59+
+
60+
#if defined(__AVR_HAVE_PRR2_PRSPI2)
61+
#define power_spi2_enable() (PRR2 &= (uint8_t)~(1 << PRSPI2))
62+
#define power_spi2_disable() (PRR2 |= (uint8_t)(1 << PRSPI2))
63+
@@ -939,11 +964,21 @@
64+
#define power_tx_modulator_disable() (PRR2 |= (uint8_t)(1 << PRTM))
65+
#endif
66+
67+
+#if defined(__AVR_HAVE_PRR2_PRTWI1)
68+
+#define power_twi1_enable() (PRR2 &= (uint8_t)~(1 << PRTWI1))
69+
+#define power_twi1_disable() (PRR2 |= (uint8_t)(1 << PRTWI1))
70+
+#endif
71+
+
72+
#if defined(__AVR_HAVE_PRR2_PRTWI2)
73+
#define power_twi2_enable() (PRR2 &= (uint8_t)~(1 << PRTWI2))
74+
#define power_twi2_disable() (PRR2 |= (uint8_t)(1 << PRTWI2))
75+
#endif
76+
77+
+#if defined(__AVR_HAVE_PRR2_PRUSART2)
78+
+#define power_usart2_enable() (PRR2 &= (uint8_t)~(1 << PRUSART2))
79+
+#define power_usart2_disable() (PRR2 |= (uint8_t)(1 << PRUSART2))
80+
+#endif
81+
+
82+
#if defined(__AVR_HAVE_PRR2_PRXA)
83+
#define power_rx_buffer_A_enable() (PRR2 &= (uint8_t)~(1 << PRXA))
84+
#define power_rx_buffer_A_disable() (PRR2 |= (uint8_t)(1 << PRXA))
85+
@@ -1350,6 +1385,7 @@
86+
|| defined(__AVR_ATmega324A__) \
87+
|| defined(__AVR_ATmega324P__) \
88+
|| defined(__AVR_ATmega324PA__) \
89+
+|| defined(__AVR_ATmega324PB__) \
90+
|| defined(__AVR_ATmega325__) \
91+
|| defined(__AVR_ATmega325A__) \
92+
|| defined(__AVR_ATmega325P__) \
93+
@@ -1360,6 +1396,7 @@
94+
|| defined(__AVR_ATmega3250PA__) \
95+
|| defined(__AVR_ATmega328__) \
96+
|| defined(__AVR_ATmega328P__) \
97+
+|| defined(__AVR_ATmega328PB__) \
98+
|| defined(__AVR_ATmega329__) \
99+
|| defined(__AVR_ATmega329A__) \
100+
|| defined(__AVR_ATmega329P__) \

avr-libc-patches/03-eeprom.patch

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- a/include/avr/eeprom.h 2020-05-26 14:04:10.000000000 +0200
2+
+++ b/include/avr/eeprom.h 2020-05-26 11:29:38.153645260 +0200
3+
@@ -112,8 +112,10 @@
4+
*/
5+
#if defined (__DOXYGEN__)
6+
# define eeprom_is_ready()
7+
-#elif defined (__AVR_XMEGA__) && __AVR_XMEGA__
8+
+#elif defined (NVM_STATUS)
9+
# define eeprom_is_ready() bit_is_clear (NVM_STATUS, NVM_NVMBUSY_bp)
10+
+#elif defined (NVMCTRL_STATUS)
11+
+# define eeprom_is_ready() bit_is_clear (NVMCTRL_STATUS, NVMCTRL_EEBUSY_bp)
12+
#elif defined (DEECR)
13+
# define eeprom_is_ready() bit_is_clear (DEECR, BSY)
14+
#elif defined (EEPE)

0 commit comments

Comments
 (0)