vlib: move pci api types from vnet/pci to vlib/pci

Type: fix

Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Change-Id: I1a60809a8bbbbb8ac8b65ab990d51aae1229647f
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>

6 files changed, 2 insertions, 124 deletions

diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt
index 95068f96e9a..1574c3daa70 100644
--- a/src/vnet/CMakeLists.txt
+++ b/src/vnet/CMakeLists.txt
@@ -1516,20 +1516,6 @@ list(APPEND VNET_HEADERS
 list(APPEND VNET_API_FILES syslog/syslog.api)
 
 ##############################################################################
-# PCI
-##############################################################################
-
-list (APPEND VNET_SOURCES
-  pci/pci_types_api.c
-)
-
-list(APPEND VNET_HEADERS
-  pci/pci_types_api.h
-)
-
-list(APPEND VNET_API_FILES pci/pci_types.api)
-
-##############################################################################
 # Tunnel Endpoint Information Base
 ##############################################################################
 
diff --git a/src/vnet/devices/virtio/virtio.api b/src/vnet/devices/virtio/virtio.api
index efbcba8fa43..34f00fad22c 100644
--- a/src/vnet/devices/virtio/virtio.api
+++ b/src/vnet/devices/virtio/virtio.api
@@ -17,7 +17,7 @@ option version = "2.0.0";
 
 import "vnet/interface_types.api";
 import "vnet/ethernet/ethernet_types.api";
-import "vnet/pci/pci_types.api";
+import "vlib/pci/pci_types.api";
 
 
 /** \brief Initialize a new virtio pci interface with the given parameters
diff --git a/src/vnet/devices/virtio/virtio_api.c b/src/vnet/devices/virtio/virtio_api.c
index 4d98e725fde..96ed927dc38 100644
--- a/src/vnet/devices/virtio/virtio_api.c
+++ b/src/vnet/devices/virtio/virtio_api.c
@@ -25,7 +25,7 @@
 #include <vnet/ip/ip.h>
 #include <vnet/devices/virtio/virtio.h>
 #include <vnet/devices/virtio/pci.h>
-#include <vnet/pci/pci_types_api.h>
+#include <vlib/pci/pci_types_api.h>
 
 #include <vnet/vnet_msg_enum.h>
 
diff --git a/src/vnet/pci/pci_types.api b/src/vnet/pci/pci_types.api
deleted file mode 100644
index d3654af536c..00000000000
--- a/src/vnet/pci/pci_types.api
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2019 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-option version = "1.0.0";
-
-typedef pci_address
-{
-  u16 domain;
-  u8 bus;
-  u8 slot;
-  u8 function;
-};
diff --git a/src/vnet/pci/pci_types_api.c b/src/vnet/pci/pci_types_api.c
deleted file mode 100644
index 5d1abec5af8..00000000000
--- a/src/vnet/pci/pci_types_api.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2019 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <vlibapi/api_types.h>
-#include <vnet/pci/pci_types_api.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
-
-void
-pci_address_decode (const vl_api_pci_address_t * in, vlib_pci_addr_t * out)
-{
-  out->domain = in->domain;
-  out->bus = in->bus;
-  out->slot = in->slot;
-  out->function = in->function;
-}
-
-void
-pci_address_encode (const vlib_pci_addr_t * in, vl_api_pci_address_t * out)
-{
-  out->domain = in->domain;
-  out->bus = in->bus;
-  out->slot = in->slot;
-  out->function = in->function;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/vnet/pci/pci_types_api.h b/src/vnet/pci/pci_types_api.h
deleted file mode 100644
index 16e126d5c99..00000000000
--- a/src/vnet/pci/pci_types_api.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2019 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __PCI_TYPES_API_H__
-#define __PCI_TYPES_API_H__
-
-#include <vlibapi/api_types.h>
-#include <vlib/pci/pci.h>
-
-struct _vl_api_pci_address;
-
-extern void pci_address_decode (const struct _vl_api_pci_address * in, vlib_pci_addr_t * out);
-extern void pci_address_encode (const vlib_pci_addr_t * in, struct _vl_api_pci_address * out);
-
-#endif /* PCI_TYPES_API_H */