From 23e80902578ec682ae40f4b3e1bb349f8ab4d9e1 Mon Sep 17 00:00:00 2001
From: Jesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com>
Date: Thu, 2 Jul 2015 19:50:18 -0300
Subject: [PATCH] x86: Move available drivers into drivers/legacy_pc/

All drivers implemented so far are for chips which are only available
on legacy x86 PCs. This commit moves them into a more appropriate folder,
also making the cpu/x86/drivers/ folder ready for other x86 based SoCs.
---
 cpu/x86/Makefile.x86                    | 2 +-
 cpu/x86/drivers/{ => legacy_pc}/pic.c   | 2 +-
 cpu/x86/drivers/{ => legacy_pc}/pic.h   | 0
 cpu/x86/drivers/{ => legacy_pc}/pit.c   | 4 ++--
 cpu/x86/drivers/{ => legacy_pc}/pit.h   | 0
 cpu/x86/drivers/{ => legacy_pc}/rtc.c   | 4 ++--
 cpu/x86/drivers/{ => legacy_pc}/rtc.h   | 0
 platform/galileo/core/sys/clock.c       | 2 +-
 platform/galileo/core/sys/rtimer-arch.c | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename cpu/x86/drivers/{ => legacy_pc}/pic.c (98%)
 rename cpu/x86/drivers/{ => legacy_pc}/pic.h (100%)
 rename cpu/x86/drivers/{ => legacy_pc}/pit.c (97%)
 rename cpu/x86/drivers/{ => legacy_pc}/pit.h (100%)
 rename cpu/x86/drivers/{ => legacy_pc}/rtc.c (97%)
 rename cpu/x86/drivers/{ => legacy_pc}/rtc.h (100%)

diff --git a/cpu/x86/Makefile.x86 b/cpu/x86/Makefile.x86
index d5772d973..4cb49df37 100644
--- a/cpu/x86/Makefile.x86
+++ b/cpu/x86/Makefile.x86
@@ -1,4 +1,4 @@
-CONTIKI_CPU_DIRS = . drivers
+CONTIKI_CPU_DIRS = . drivers/legacy_pc
 
 CONTIKI_SOURCEFILES += gdt.c helpers.S idt.c cpu.c rtc.c pit.c pic.c
 
diff --git a/cpu/x86/drivers/pic.c b/cpu/x86/drivers/legacy_pc/pic.c
similarity index 98%
rename from cpu/x86/drivers/pic.c
rename to cpu/x86/drivers/legacy_pc/pic.c
index 12b79e39b..1acb351d1 100644
--- a/cpu/x86/drivers/pic.c
+++ b/cpu/x86/drivers/legacy_pc/pic.c
@@ -28,7 +28,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "drivers/pic.h"
+#include "drivers/legacy_pc/pic.h"
 
 #define PIC_ACK 0x20
 
diff --git a/cpu/x86/drivers/pic.h b/cpu/x86/drivers/legacy_pc/pic.h
similarity index 100%
rename from cpu/x86/drivers/pic.h
rename to cpu/x86/drivers/legacy_pc/pic.h
diff --git a/cpu/x86/drivers/pit.c b/cpu/x86/drivers/legacy_pc/pit.c
similarity index 97%
rename from cpu/x86/drivers/pit.c
rename to cpu/x86/drivers/legacy_pc/pit.c
index 557b27985..3d7b2816d 100644
--- a/cpu/x86/drivers/pit.c
+++ b/cpu/x86/drivers/legacy_pc/pit.c
@@ -30,8 +30,8 @@
 
 #include <math.h>
 
-#include "drivers/pic.h"
-#include "pit.h"
+#include "drivers/legacy_pc/pic.h"
+#include "drivers/legacy_pc/pit.h"
 #include "helpers.h"
 #include "interrupt.h"
 
diff --git a/cpu/x86/drivers/pit.h b/cpu/x86/drivers/legacy_pc/pit.h
similarity index 100%
rename from cpu/x86/drivers/pit.h
rename to cpu/x86/drivers/legacy_pc/pit.h
diff --git a/cpu/x86/drivers/rtc.c b/cpu/x86/drivers/legacy_pc/rtc.c
similarity index 97%
rename from cpu/x86/drivers/rtc.c
rename to cpu/x86/drivers/legacy_pc/rtc.c
index ad9eec221..7ba6dccc3 100644
--- a/cpu/x86/drivers/rtc.c
+++ b/cpu/x86/drivers/legacy_pc/rtc.c
@@ -28,8 +28,8 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "drivers/rtc.h"
-#include "drivers/pic.h"
+#include "drivers/legacy_pc/rtc.h"
+#include "drivers/legacy_pc/pic.h"
 #include "helpers.h"
 #include "interrupt.h"
 
diff --git a/cpu/x86/drivers/rtc.h b/cpu/x86/drivers/legacy_pc/rtc.h
similarity index 100%
rename from cpu/x86/drivers/rtc.h
rename to cpu/x86/drivers/legacy_pc/rtc.h
diff --git a/platform/galileo/core/sys/clock.c b/platform/galileo/core/sys/clock.c
index d81ba835f..e84ef20eb 100644
--- a/platform/galileo/core/sys/clock.c
+++ b/platform/galileo/core/sys/clock.c
@@ -32,7 +32,7 @@
 #include "sys/etimer.h"
 
 #include "contiki-conf.h"
-#include "drivers/rtc.h"
+#include "drivers/legacy_pc/rtc.h"
 
 #if CLOCK_CONF_SECOND == 2
 #define FREQ   RTC_2_HZ
diff --git a/platform/galileo/core/sys/rtimer-arch.c b/platform/galileo/core/sys/rtimer-arch.c
index 862c26692..71c4f13f5 100644
--- a/platform/galileo/core/sys/rtimer-arch.c
+++ b/platform/galileo/core/sys/rtimer-arch.c
@@ -31,7 +31,7 @@
 #include "sys/rtimer.h"
 
 #include "contiki-conf.h"
-#include "drivers/pit.h"
+#include "drivers/legacy_pc/pit.h"
 
 static volatile rtimer_clock_t tick_count = 0;
 static rtimer_clock_t trigger = UINT64_MAX;