Browse Source

devices -> drivers

Aaron Lindsay 7 years ago
parent
commit
3f624153e7

+ 1 - 1
Makefile

@@ -30,7 +30,7 @@ KOBJS :=
30 30
 
31 31
 # Initialize sub-directory Makefile inclusion
32 32
 BASEDIR = $(shell pwd)
33
-SUBDIRS := boot kernel devices
33
+SUBDIRS := boot kernel drivers
34 34
 ifneq (,$(SUBDIRS))
35 35
 	include $(patsubst %,%/kernel.mk,$(SUBDIRS))
36 36
 endif

devices/bcm2835_mailbox.c → drivers/bcm2835_mailbox.c


devices/bcm2835_videocore.c → drivers/bcm2835_videocore.c

@@ -22,7 +22,7 @@
22 22
 #include <framebuffer.h>
23 23
 #include <kmalloc.h>
24 24
 #include <print.h>
25
-#include <devices/bcm2835_mailbox.h>
25
+#include <drivers/bcm2835_mailbox.h>
26 26
 
27 27
 struct bcm2835_config {
28 28
 	uint32 width;

devices/kernel.mk → drivers/kernel.mk

@@ -1,4 +1,4 @@
1
-DIRNAME := devices
1
+DIRNAME := drivers
2 2
 SUBDIRS :=
3 3
 
4 4
 include $(BASEDIR)/header.mk

devices/pi_mini_uart.c → drivers/pi_mini_uart.c


devices/pl011.c → drivers/pl011.c


devices/pl110.c → drivers/pl110.c


devices/pl111.c → drivers/pl111.c


include/devices/bcm2835_mailbox.h → include/drivers/bcm2835_mailbox.h


include/devices/bcm2835_videocore.h → include/drivers/bcm2835_videocore.h


include/devices/pi_mini_uart.h → include/drivers/pi_mini_uart.h


include/devices/pl011.h → include/drivers/pl011.h


include/devices/pl110.h → include/drivers/pl110.h


include/devices/pl111.h → include/drivers/pl111.h


+ 4 - 4
kernel/start_kernel.c

@@ -27,13 +27,13 @@
27 27
 #include <console.h>
28 28
 
29 29
 #ifdef CONFIG_VEXPRESS_A9
30
-#include <devices/pl011.h>
31
-#include <devices/pl111.h>
30
+#include <drivers/pl011.h>
31
+#include <drivers/pl111.h>
32 32
 #endif
33 33
 
34 34
 #ifdef CONFIG_RPI
35
-#include <devices/pi_mini_uart.h>
36
-#include <devices/bcm2835_videocore.h>
35
+#include <drivers/pi_mini_uart.h>
36
+#include <drivers/bcm2835_videocore.h>
37 37
 #endif
38 38
 
39 39
 struct fb myfb;