[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[avr-libc-commit] [2455] Move SLEEP_MODE defines from sleep. h to device
|
From: |
Senthil Kumar Selvaraj |
|
Subject: |
[avr-libc-commit] [2455] Move SLEEP_MODE defines from sleep. h to device headers for xmega devices, and branch on __AVR_XMEGA__ instead of device names. |
|
Date: |
Wed, 19 Nov 2014 09:31:28 +0000 |
Revision: 2455
http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2455
Author: saaadhu
Date: 2014-11-19 09:31:27 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
Move SLEEP_MODE defines from sleep.h to device headers for xmega devices, and
branch on __AVR_XMEGA__ instead of device names.
Modified Paths:
--------------
trunk/avr-libc/ChangeLog
trunk/avr-libc/include/avr/iox128a1.h
trunk/avr-libc/include/avr/iox128a1u.h
trunk/avr-libc/include/avr/iox128a3.h
trunk/avr-libc/include/avr/iox128a3u.h
trunk/avr-libc/include/avr/iox128a4u.h
trunk/avr-libc/include/avr/iox128b1.h
trunk/avr-libc/include/avr/iox128b3.h
trunk/avr-libc/include/avr/iox128c3.h
trunk/avr-libc/include/avr/iox128d3.h
trunk/avr-libc/include/avr/iox128d4.h
trunk/avr-libc/include/avr/iox16a4.h
trunk/avr-libc/include/avr/iox16a4u.h
trunk/avr-libc/include/avr/iox16c4.h
trunk/avr-libc/include/avr/iox16d4.h
trunk/avr-libc/include/avr/iox192a3.h
trunk/avr-libc/include/avr/iox192a3u.h
trunk/avr-libc/include/avr/iox192c3.h
trunk/avr-libc/include/avr/iox192d3.h
trunk/avr-libc/include/avr/iox256a3.h
trunk/avr-libc/include/avr/iox256a3b.h
trunk/avr-libc/include/avr/iox256a3bu.h
trunk/avr-libc/include/avr/iox256a3u.h
trunk/avr-libc/include/avr/iox256c3.h
trunk/avr-libc/include/avr/iox256d3.h
trunk/avr-libc/include/avr/iox32a4.h
trunk/avr-libc/include/avr/iox32a4u.h
trunk/avr-libc/include/avr/iox32c4.h
trunk/avr-libc/include/avr/iox32d4.h
trunk/avr-libc/include/avr/iox384c3.h
trunk/avr-libc/include/avr/iox384d3.h
trunk/avr-libc/include/avr/iox64a1.h
trunk/avr-libc/include/avr/iox64a1u.h
trunk/avr-libc/include/avr/iox64a3.h
trunk/avr-libc/include/avr/iox64a3u.h
trunk/avr-libc/include/avr/iox64a4u.h
trunk/avr-libc/include/avr/iox64b1.h
trunk/avr-libc/include/avr/iox64b3.h
trunk/avr-libc/include/avr/iox64c3.h
trunk/avr-libc/include/avr/iox64d3.h
trunk/avr-libc/include/avr/iox64d4.h
trunk/avr-libc/include/avr/sleep.h
Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog 2014-10-19 08:43:59 UTC (rev 2454)
+++ trunk/avr-libc/ChangeLog 2014-11-19 09:31:27 UTC (rev 2455)
@@ -1,3 +1,50 @@
+2014-10-15 Soundararajan Dhakshinamoorthy <address@hidden>
+
+ patch $8557: Proposing to remove device specific xmega macros
+ from sleep.h.
+ * include/avr/iox128a1.h: Add SLEEP_MODE defines.
+ * include/avr/iox128a1u.h: Likewise.
+ * include/avr/iox128a3.h: Likewise.
+ * include/avr/iox128a3u.h: Likewise.
+ * include/avr/iox128a4u.h: Likewise.
+ * include/avr/iox128b1.h: Likewise.
+ * include/avr/iox128b3.h: Likewise.
+ * include/avr/iox128c3.h: Likewise.
+ * include/avr/iox128d3.h: Likewise.
+ * include/avr/iox128d4.h: Likewise.
+ * include/avr/iox16a4.h: Likewise.
+ * include/avr/iox16a4u.h: Likewise.
+ * include/avr/iox16c4.h: Likewise.
+ * include/avr/iox16d4.h: Likewise.
+ * include/avr/iox192a3.h: Likewise.
+ * include/avr/iox192a3u.h: Likewise.
+ * include/avr/iox192c3.h: Likewise.
+ * include/avr/iox192d3.h: Likewise.
+ * include/avr/iox256a3.h: Likewise.
+ * include/avr/iox256a3b.h: Likewise.
+ * include/avr/iox256a3bu.h: Likewise.
+ * include/avr/iox256a3u.h: Likewise.
+ * include/avr/iox256c3.h: Likewise.
+ * include/avr/iox256d3.h: Likewise.
+ * include/avr/iox32a4.h: Likewise.
+ * include/avr/iox32a4u.h: Likewise.
+ * include/avr/iox32c4.h: Likewise.
+ * include/avr/iox32d4.h: Likewise.
+ * include/avr/iox384c3.h: Likewise.
+ * include/avr/iox384d3.h: Likewise.
+ * include/avr/iox64a1.h: Likewise.
+ * include/avr/iox64a1u.h: Likewise.
+ * include/avr/iox64a3.h: Likewise.
+ * include/avr/iox64a3u.h: Likewise.
+ * include/avr/iox64a4u.h: Likewise.
+ * include/avr/iox64b1.h: Likewise.
+ * include/avr/iox64b3.h: Likewise.
+ * include/avr/iox64c3.h: Likewise.
+ * include/avr/iox64d3.h: Likewise.
+ * include/avr/iox64d4.h: Likewise.
+ * include/avr/sleep.h (set_sleep_mode): Use __AVR_XMEGA__ instead
+ of device names. Remove SLEEP_MODE defines.
+
2014-10-18 Senthil Kumar Selvaraj <address@hidden>
Georg-Johann Lay <address@hidden>
Modified: trunk/avr-libc/include/avr/iox128a1.h
===================================================================
--- trunk/avr-libc/include/avr/iox128a1.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox128a1.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -266,6 +266,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox128a1u.h
===================================================================
--- trunk/avr-libc/include/avr/iox128a1u.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox128a1u.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -284,6 +284,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox128a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox128a3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox128a3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -266,6 +266,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox128a3u.h
===================================================================
--- trunk/avr-libc/include/avr/iox128a3u.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox128a3u.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -301,6 +301,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox128a4u.h
===================================================================
--- trunk/avr-libc/include/avr/iox128a4u.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox128a4u.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -301,6 +301,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox128b1.h
===================================================================
--- trunk/avr-libc/include/avr/iox128b1.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox128b1.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -264,6 +264,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox128b3.h
===================================================================
--- trunk/avr-libc/include/avr/iox128b3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox128b3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -264,6 +264,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox128c3.h
===================================================================
--- trunk/avr-libc/include/avr/iox128c3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox128c3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -277,6 +277,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox128d3.h
===================================================================
--- trunk/avr-libc/include/avr/iox128d3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox128d3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -248,6 +248,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox128d4.h
===================================================================
--- trunk/avr-libc/include/avr/iox128d4.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox128d4.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -259,6 +259,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox16a4.h
===================================================================
--- trunk/avr-libc/include/avr/iox16a4.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox16a4.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -266,6 +266,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox16a4u.h
===================================================================
--- trunk/avr-libc/include/avr/iox16a4u.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox16a4u.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -301,6 +301,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox16c4.h
===================================================================
--- trunk/avr-libc/include/avr/iox16c4.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox16c4.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -277,6 +277,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox16d4.h
===================================================================
--- trunk/avr-libc/include/avr/iox16d4.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox16d4.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -266,6 +266,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox192a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox192a3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox192a3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -266,6 +266,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox192a3u.h
===================================================================
--- trunk/avr-libc/include/avr/iox192a3u.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox192a3u.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -301,6 +301,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox192c3.h
===================================================================
--- trunk/avr-libc/include/avr/iox192c3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox192c3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -277,6 +277,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox192d3.h
===================================================================
--- trunk/avr-libc/include/avr/iox192d3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox192d3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -248,6 +248,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox256a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox256a3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox256a3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -266,6 +266,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox256a3b.h
===================================================================
--- trunk/avr-libc/include/avr/iox256a3b.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox256a3b.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -267,6 +267,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox256a3bu.h
===================================================================
--- trunk/avr-libc/include/avr/iox256a3bu.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox256a3bu.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -301,6 +301,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox256a3u.h
===================================================================
--- trunk/avr-libc/include/avr/iox256a3u.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox256a3u.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -301,6 +301,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox256c3.h
===================================================================
--- trunk/avr-libc/include/avr/iox256c3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox256c3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -277,6 +277,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox256d3.h
===================================================================
--- trunk/avr-libc/include/avr/iox256d3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox256d3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -243,6 +243,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox32a4.h
===================================================================
--- trunk/avr-libc/include/avr/iox32a4.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox32a4.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -266,6 +266,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox32a4u.h
===================================================================
--- trunk/avr-libc/include/avr/iox32a4u.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox32a4u.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -301,6 +301,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox32c4.h
===================================================================
--- trunk/avr-libc/include/avr/iox32c4.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox32c4.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -277,6 +277,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox32d4.h
===================================================================
--- trunk/avr-libc/include/avr/iox32d4.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox32d4.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -248,6 +248,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox384c3.h
===================================================================
--- trunk/avr-libc/include/avr/iox384c3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox384c3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -277,6 +277,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox384d3.h
===================================================================
--- trunk/avr-libc/include/avr/iox384d3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox384d3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -259,6 +259,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox64a1.h
===================================================================
--- trunk/avr-libc/include/avr/iox64a1.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox64a1.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -266,6 +266,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox64a1u.h
===================================================================
--- trunk/avr-libc/include/avr/iox64a1u.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox64a1u.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -284,6 +284,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox64a3.h
===================================================================
--- trunk/avr-libc/include/avr/iox64a3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox64a3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -266,6 +266,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox64a3u.h
===================================================================
--- trunk/avr-libc/include/avr/iox64a3u.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox64a3u.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -301,6 +301,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox64a4u.h
===================================================================
--- trunk/avr-libc/include/avr/iox64a4u.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox64a4u.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -301,6 +301,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox64b1.h
===================================================================
--- trunk/avr-libc/include/avr/iox64b1.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox64b1.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -264,6 +264,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox64b3.h
===================================================================
--- trunk/avr-libc/include/avr/iox64b3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox64b3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -264,6 +264,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox64c3.h
===================================================================
--- trunk/avr-libc/include/avr/iox64c3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox64c3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -277,6 +277,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox64d3.h
===================================================================
--- trunk/avr-libc/include/avr/iox64d3.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox64d3.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -248,6 +248,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/iox64d4.h
===================================================================
--- trunk/avr-libc/include/avr/iox64d4.h 2014-10-19 08:43:59 UTC (rev
2454)
+++ trunk/avr-libc/include/avr/iox64d4.h 2014-11-19 09:31:27 UTC (rev
2455)
@@ -259,6 +259,13 @@
} SLEEP_SMODE_t;
+#define SLEEP_MODE_IDLE (0x00<<1)
+#define SLEEP_MODE_PWR_DOWN (0x02<<1)
+#define SLEEP_MODE_PWR_SAVE (0x03<<1)
+#define SLEEP_MODE_STANDBY (0x06<<1)
+#define SLEEP_MODE_EXT_STANDBY (0x07<<1)
+
+
/*
--------------------------------------------------------------------------
OSC - Oscillator
Modified: trunk/avr-libc/include/avr/sleep.h
===================================================================
--- trunk/avr-libc/include/avr/sleep.h 2014-10-19 08:43:59 UTC (rev 2454)
+++ trunk/avr-libc/include/avr/sleep.h 2014-11-19 09:31:27 UTC (rev 2455)
@@ -449,53 +449,8 @@
_SLEEP_CONTROL_REG = ((_SLEEP_CONTROL_REG & ~(_BV(SM0) | _BV(SM1) |
_BV(SM2))) | (mode)); \
} while(0)
-#elif defined(__AVR_ATxmega16A4__) \
-|| defined(__AVR_ATxmega16A4U__) \
-|| defined(__AVR_ATxmega16C4__) \
-|| defined(__AVR_ATxmega16D4__) \
-|| defined(__AVR_ATxmega32A4__) \
-|| defined(__AVR_ATxmega32A4U__) \
-|| defined(__AVR_ATxmega32C4__) \
-|| defined(__AVR_ATxmega32D4__) \
-|| defined(__AVR_ATxmega64A1__) \
-|| defined(__AVR_ATxmega64A1U__) \
-|| defined(__AVR_ATxmega64A3__) \
-|| defined(__AVR_ATxmega64A3U__) \
-|| defined(__AVR_ATxmega64A4U__) \
-|| defined(__AVR_ATxmega64B1__) \
-|| defined(__AVR_ATxmega64B3__) \
-|| defined(__AVR_ATxmega64C3__) \
-|| defined(__AVR_ATxmega64D3__) \
-|| defined(__AVR_ATxmega64D4__) \
-|| defined(__AVR_ATxmega128A1__) \
-|| defined(__AVR_ATxmega128A1U__) \
-|| defined(__AVR_ATxmega128A3__) \
-|| defined(__AVR_ATxmega128A3U__) \
-|| defined(__AVR_ATxmega128A4U__) \
-|| defined(__AVR_ATxmega128B1__) \
-|| defined(__AVR_ATxmega128B3__) \
-|| defined(__AVR_ATxmega128C3__) \
-|| defined(__AVR_ATxmega128D3__) \
-|| defined(__AVR_ATxmega128D4__) \
-|| defined(__AVR_ATxmega192A3__) \
-|| defined(__AVR_ATxmega192A3U__) \
-|| defined(__AVR_ATxmega192C3__) \
-|| defined(__AVR_ATxmega192D3__) \
-|| defined(__AVR_ATxmega256A3__) \
-|| defined(__AVR_ATxmega256A3U__) \
-|| defined(__AVR_ATxmega256C3__) \
-|| defined(__AVR_ATxmega256D3__) \
-|| defined(__AVR_ATxmega256A3B__) \
-|| defined(__AVR_ATxmega256A3BU__) \
-|| defined(__AVR_ATxmega384C3__) \
-|| defined(__AVR_ATxmega384D3__)
+#elif defined(__AVR_XMEGA__)
- #define SLEEP_MODE_IDLE (0)
- #define SLEEP_MODE_PWR_DOWN (SLEEP_SMODE1_bm)
- #define SLEEP_MODE_PWR_SAVE (SLEEP_SMODE1_bm | SLEEP_SMODE0_bm)
- #define SLEEP_MODE_STANDBY (SLEEP_SMODE2_bm | SLEEP_SMODE1_bm)
- #define SLEEP_MODE_EXT_STANDBY (SLEEP_SMODE2_bm | SLEEP_SMODE1_bm |
SLEEP_SMODE0_bm)
-
#define set_sleep_mode(mode) \
do { \
_SLEEP_CONTROL_REG = ((_SLEEP_CONTROL_REG & ~(SLEEP_SMODE2_bm |
SLEEP_SMODE1_bm | SLEEP_SMODE0_bm)) | (mode)); \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [avr-libc-commit] [2455] Move SLEEP_MODE defines from sleep. h to device headers for xmega devices, and branch on __AVR_XMEGA__ instead of device names.,
Senthil Kumar Selvaraj <=