From c078e11db839058a499f43d61fedfea8ea077966 Mon Sep 17 00:00:00 2001
From: Christopher Anderson <cja@google.com>
Date: Wed, 14 Nov 2018 14:33:50 -0800
Subject: [PATCH] [pci] Move legacy kpci driver into kpci/
Test: build/ran kpci with graphics under qemu
Change-Id: I87a256ccc299f11cd1fd4aa4667a9acf89d364b7
---
system/dev/bus/pci/{ => kpci}/kpci-private.h | 0
system/dev/bus/pci/{ => kpci}/kpci.c | 0
system/dev/bus/pci/{ => kpci}/proxy.c | 0
system/dev/bus/pci/rules.mk | 26 +++++++++++++++-----
4 files changed, 20 insertions(+), 6 deletions(-)
rename system/dev/bus/pci/{ => kpci}/kpci-private.h (100%)
rename system/dev/bus/pci/{ => kpci}/kpci.c (100%)
rename system/dev/bus/pci/{ => kpci}/proxy.c (100%)
diff --git a/system/dev/bus/pci/kpci-private.h b/system/dev/bus/pci/kpci/kpci-private.h
similarity index 100%
rename from system/dev/bus/pci/kpci-private.h
rename to system/dev/bus/pci/kpci/kpci-private.h
diff --git a/system/dev/bus/pci/kpci.c b/system/dev/bus/pci/kpci/kpci.c
similarity index 100%
rename from system/dev/bus/pci/kpci.c
rename to system/dev/bus/pci/kpci/kpci.c
diff --git a/system/dev/bus/pci/proxy.c b/system/dev/bus/pci/kpci/proxy.c
similarity index 100%
rename from system/dev/bus/pci/proxy.c
rename to system/dev/bus/pci/kpci/proxy.c
diff --git a/system/dev/bus/pci/rules.mk b/system/dev/bus/pci/rules.mk
index 080246853f2..f1c5543e3ac 100644
--- a/system/dev/bus/pci/rules.mk
+++ b/system/dev/bus/pci/rules.mk
@@ -38,18 +38,32 @@ MODULE := $(LOCAL_DIR)
MODULE_TYPE := driver
MODULE_NAME := bus-pci
-MODULE_SRCS := $(LOCAL_DIR)/kpci.c
+MODULE_SRCS := $(LOCAL_DIR)/kpci/kpci.c
MODULE_STATIC_LIBS := system/ulib/ddk
-MODULE_LIBS := system/ulib/driver system/ulib/zircon system/ulib/c
-MODULE_BANJO_LIBS := system/banjo/ddk-protocol-pci system/banjo/ddk-protocol-pciroot system/banjo/ddk-protocol-platform-device
+MODULE_LIBS := \
+ system/ulib/driver \
+ system/ulib/zircon \
+ system/ulib/c
+
+MODULE_BANJO_LIBS := \
+ system/banjo/ddk-protocol-pci \
+ system/banjo/ddk-protocol-pciroot \
+ system/banjo/ddk-protocol-platform-device
include make/module.mk
MODULE := $(LOCAL_DIR).proxy
MODULE_TYPE := driver
MODULE_NAME := bus-pci.proxy
-MODULE_SRCS := $(LOCAL_DIR)/proxy.c
+MODULE_SRCS := $(LOCAL_DIR)/kpci/proxy.c
MODULE_STATIC_LIBS := system/ulib/ddk
-MODULE_LIBS := system/ulib/driver system/ulib/zircon system/ulib/c
-MODULE_BANJO_LIBS := system/banjo/ddk-protocol-pci system/banjo/ddk-protocol-pciroot system/banjo/ddk-protocol-platform-device
+MODULE_LIBS := \
+ system/ulib/driver \
+ system/ulib/zircon \
+ system/ulib/c
+
+MODULE_BANJO_LIBS := \
+ system/banjo/ddk-protocol-pci \
+ system/banjo/ddk-protocol-pciroot \
+ system/banjo/ddk-protocol-platform-device
include make/module.mk
endif
--
GitLab