From 9e64659133d3c12fb6e315ae8de74d9b912f90dd Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 5 Oct 2013 17:28:53 +0800 Subject: [PATCH] Modules/UDI - Moved UDI headers to /UDI/include --- KernelLand/Modules/Interfaces/UDI/Makefile | 2 +- KernelLand/Modules/Makefile.tpl | 2 +- {KernelLand/Modules/Interfaces/UDI => UDI}/include/physio/dma.h | 0 .../Modules/Interfaces/UDI => UDI}/include/physio/dma_const.h | 0 .../Modules/Interfaces/UDI => UDI}/include/physio/meta_bus.h | 0 .../Modules/Interfaces/UDI => UDI}/include/physio/meta_intr.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/physio/pci.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/physio/pio.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi.h | 2 +- .../UDI/include/udi/arch/x86.h => UDI/include/udi/arch/ia32.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/attr.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/buf.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/cb.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/imc.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/init.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/log.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/mei.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/mem.h | 0 .../Modules/Interfaces/UDI => UDI}/include/udi/meta_gio.h | 0 .../Modules/Interfaces/UDI => UDI}/include/udi/meta_mgmt.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/queues.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/strmem.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/time.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi_nic.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi_pci.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi_physio.h | 0 {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi_scsi.h | 0 27 files changed, 3 insertions(+), 3 deletions(-) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/physio/dma.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/physio/dma_const.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/physio/meta_bus.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/physio/meta_intr.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/physio/pci.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/physio/pio.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi.h (99%) rename KernelLand/Modules/Interfaces/UDI/include/udi/arch/x86.h => UDI/include/udi/arch/ia32.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/attr.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/buf.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/cb.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/imc.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/init.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/log.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/mei.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/mem.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/meta_gio.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/meta_mgmt.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/queues.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/strmem.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi/time.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi_nic.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi_pci.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi_physio.h (100%) rename {KernelLand/Modules/Interfaces/UDI => UDI}/include/udi_scsi.h (100%) diff --git a/KernelLand/Modules/Interfaces/UDI/Makefile b/KernelLand/Modules/Interfaces/UDI/Makefile index 68155a9f..a895de43 100644 --- a/KernelLand/Modules/Interfaces/UDI/Makefile +++ b/KernelLand/Modules/Interfaces/UDI/Makefile @@ -1,7 +1,7 @@ # # -CPPFLAGS = -I./include +CPPFLAGS = -I../../../../UDI/include # - UDI Library Files LIB_OBJS := logging.o strmem.o imc.o mem.o buf.o cb.o diff --git a/KernelLand/Modules/Makefile.tpl b/KernelLand/Modules/Makefile.tpl index 98d0760c..a5ea222a 100644 --- a/KernelLand/Modules/Makefile.tpl +++ b/KernelLand/Modules/Makefile.tpl @@ -75,7 +75,7 @@ obj-$(_SUFFIX)/%.o: %.c Makefile $(CFGFILES) @echo --- $(CC) -o $@ @mkdir -p $(dir $@) @$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< - @$(CC) -M $(CPPFLAGS) -MT $@ -o obj-$(_SUFFIX)/$*.d $< + @$(CC) -M $(CPPFLAGS) -MT $@ -MP -o obj-$(_SUFFIX)/$*.d $< -include $(DEPFILES) # vim: ft=make diff --git a/KernelLand/Modules/Interfaces/UDI/include/physio/dma.h b/UDI/include/physio/dma.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/physio/dma.h rename to UDI/include/physio/dma.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/physio/dma_const.h b/UDI/include/physio/dma_const.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/physio/dma_const.h rename to UDI/include/physio/dma_const.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/physio/meta_bus.h b/UDI/include/physio/meta_bus.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/physio/meta_bus.h rename to UDI/include/physio/meta_bus.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/physio/meta_intr.h b/UDI/include/physio/meta_intr.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/physio/meta_intr.h rename to UDI/include/physio/meta_intr.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/physio/pci.h b/UDI/include/physio/pci.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/physio/pci.h rename to UDI/include/physio/pci.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/physio/pio.h b/UDI/include/physio/pio.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/physio/pio.h rename to UDI/include/physio/pio.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi.h b/UDI/include/udi.h similarity index 99% rename from KernelLand/Modules/Interfaces/UDI/include/udi.h rename to UDI/include/udi.h index 0e097d75..e4ddb94b 100644 --- a/KernelLand/Modules/Interfaces/UDI/include/udi.h +++ b/UDI/include/udi.h @@ -19,7 +19,7 @@ typedef uint32_t udi_ubit32_t; /* unsigned 32-bit: 0..232-1 */ #endif #if UDI_ABI_is_ia32 -#include "udi/arch/x86.h" +#include "udi/arch/ia32.h" #else #error "Unknown UDI ABI" #endif diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/arch/x86.h b/UDI/include/udi/arch/ia32.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/arch/x86.h rename to UDI/include/udi/arch/ia32.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/attr.h b/UDI/include/udi/attr.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/attr.h rename to UDI/include/udi/attr.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/buf.h b/UDI/include/udi/buf.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/buf.h rename to UDI/include/udi/buf.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/cb.h b/UDI/include/udi/cb.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/cb.h rename to UDI/include/udi/cb.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/imc.h b/UDI/include/udi/imc.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/imc.h rename to UDI/include/udi/imc.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/init.h b/UDI/include/udi/init.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/init.h rename to UDI/include/udi/init.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/log.h b/UDI/include/udi/log.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/log.h rename to UDI/include/udi/log.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/mei.h b/UDI/include/udi/mei.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/mei.h rename to UDI/include/udi/mei.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/mem.h b/UDI/include/udi/mem.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/mem.h rename to UDI/include/udi/mem.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/meta_gio.h b/UDI/include/udi/meta_gio.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/meta_gio.h rename to UDI/include/udi/meta_gio.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/meta_mgmt.h b/UDI/include/udi/meta_mgmt.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/meta_mgmt.h rename to UDI/include/udi/meta_mgmt.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/queues.h b/UDI/include/udi/queues.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/queues.h rename to UDI/include/udi/queues.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/strmem.h b/UDI/include/udi/strmem.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/strmem.h rename to UDI/include/udi/strmem.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi/time.h b/UDI/include/udi/time.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi/time.h rename to UDI/include/udi/time.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi_nic.h b/UDI/include/udi_nic.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi_nic.h rename to UDI/include/udi_nic.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi_pci.h b/UDI/include/udi_pci.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi_pci.h rename to UDI/include/udi_pci.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi_physio.h b/UDI/include/udi_physio.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi_physio.h rename to UDI/include/udi_physio.h diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi_scsi.h b/UDI/include/udi_scsi.h similarity index 100% rename from KernelLand/Modules/Interfaces/UDI/include/udi_scsi.h rename to UDI/include/udi_scsi.h -- 2.20.1