From 3a845cfe1586f7eed1c12ac825a09fc5b2c9ecb9 Mon Sep 17 00:00:00 2001 From: Dmitry Rozhkov Date: Wed, 29 Jan 2020 13:42:10 +0200 Subject: [PATCH] fpga: rename files to make them linux-only --- cmd/fpga_crihook/main.go | 2 +- cmd/fpga_tool/fpga_tool.go | 2 +- pkg/fpga/{linux/dfl.go => dfl_linux.go} | 5 +---- pkg/fpga/{linux/fpga.go => fpga_linux.go} | 5 +---- pkg/fpga/{linux/intel-fpga.go => intel_fpga_linux.go} | 5 +---- pkg/fpga/{linux => }/interfaces.go | 5 +---- pkg/fpga/{linux/ioctl.go => ioctl_linux.go} | 5 +---- pkg/fpga/{linux/pci.go => pci_linux.go} | 5 +---- pkg/fpga/{linux => }/types.go | 2 +- pkg/fpga/{linux => }/utils.go | 2 +- pkg/fpga/{linux => }/ztypes.go | 2 +- 11 files changed, 11 insertions(+), 29 deletions(-) rename pkg/fpga/{linux/dfl.go => dfl_linux.go} (99%) rename pkg/fpga/{linux/fpga.go => fpga_linux.go} (98%) rename pkg/fpga/{linux/intel-fpga.go => intel_fpga_linux.go} (99%) rename pkg/fpga/{linux => }/interfaces.go (99%) rename pkg/fpga/{linux/ioctl.go => ioctl_linux.go} (96%) rename pkg/fpga/{linux/pci.go => pci_linux.go} (99%) rename pkg/fpga/{linux => }/types.go (99%) rename pkg/fpga/{linux => }/utils.go (99%) rename pkg/fpga/{linux => }/ztypes.go (99%) diff --git a/cmd/fpga_crihook/main.go b/cmd/fpga_crihook/main.go index c35b9178..466f4bad 100644 --- a/cmd/fpga_crihook/main.go +++ b/cmd/fpga_crihook/main.go @@ -22,8 +22,8 @@ import ( "path/filepath" "strings" + "github.com/intel/intel-device-plugins-for-kubernetes/pkg/fpga" "github.com/intel/intel-device-plugins-for-kubernetes/pkg/fpga/bitstream" - fpga "github.com/intel/intel-device-plugins-for-kubernetes/pkg/fpga/linux" "github.com/pkg/errors" utilsexec "k8s.io/utils/exec" ) diff --git a/cmd/fpga_tool/fpga_tool.go b/cmd/fpga_tool/fpga_tool.go index 7d8ed8b2..f524ef56 100644 --- a/cmd/fpga_tool/fpga_tool.go +++ b/cmd/fpga_tool/fpga_tool.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" + "github.com/intel/intel-device-plugins-for-kubernetes/pkg/fpga" "github.com/intel/intel-device-plugins-for-kubernetes/pkg/fpga/bitstream" - fpga "github.com/intel/intel-device-plugins-for-kubernetes/pkg/fpga/linux" ) const ( diff --git a/pkg/fpga/linux/dfl.go b/pkg/fpga/dfl_linux.go similarity index 99% rename from pkg/fpga/linux/dfl.go rename to pkg/fpga/dfl_linux.go index da24c4ea..14a21ee2 100644 --- a/pkg/fpga/linux/dfl.go +++ b/pkg/fpga/dfl_linux.go @@ -11,11 +11,8 @@ // 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. -// -// +build linux -// -package linux +package fpga import ( "math" diff --git a/pkg/fpga/linux/fpga.go b/pkg/fpga/fpga_linux.go similarity index 98% rename from pkg/fpga/linux/fpga.go rename to pkg/fpga/fpga_linux.go index 01316e00..23c6acf6 100644 --- a/pkg/fpga/linux/fpga.go +++ b/pkg/fpga/fpga_linux.go @@ -11,11 +11,8 @@ // 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. -// -// +build linux -// -package linux +package fpga import ( "io/ioutil" diff --git a/pkg/fpga/linux/intel-fpga.go b/pkg/fpga/intel_fpga_linux.go similarity index 99% rename from pkg/fpga/linux/intel-fpga.go rename to pkg/fpga/intel_fpga_linux.go index d95f681b..013bb2a0 100644 --- a/pkg/fpga/linux/intel-fpga.go +++ b/pkg/fpga/intel_fpga_linux.go @@ -11,11 +11,8 @@ // 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. -// -// +build linux -// -package linux +package fpga import ( "math" diff --git a/pkg/fpga/linux/interfaces.go b/pkg/fpga/interfaces.go similarity index 99% rename from pkg/fpga/linux/interfaces.go rename to pkg/fpga/interfaces.go index e4956332..d43e1d2e 100644 --- a/pkg/fpga/linux/interfaces.go +++ b/pkg/fpga/interfaces.go @@ -11,11 +11,8 @@ // 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. -// -// +build linux -// -package linux +package fpga import ( "github.com/intel/intel-device-plugins-for-kubernetes/pkg/fpga/bitstream" diff --git a/pkg/fpga/linux/ioctl.go b/pkg/fpga/ioctl_linux.go similarity index 96% rename from pkg/fpga/linux/ioctl.go rename to pkg/fpga/ioctl_linux.go index fc9af466..b25f633a 100644 --- a/pkg/fpga/linux/ioctl.go +++ b/pkg/fpga/ioctl_linux.go @@ -11,11 +11,8 @@ // 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. -// -// +build linux -// -package linux +package fpga import ( "os" diff --git a/pkg/fpga/linux/pci.go b/pkg/fpga/pci_linux.go similarity index 99% rename from pkg/fpga/linux/pci.go rename to pkg/fpga/pci_linux.go index 1367e03e..172bb366 100644 --- a/pkg/fpga/linux/pci.go +++ b/pkg/fpga/pci_linux.go @@ -11,11 +11,8 @@ // 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. -// -// +build linux -// -package linux +package fpga import ( "fmt" diff --git a/pkg/fpga/linux/types.go b/pkg/fpga/types.go similarity index 99% rename from pkg/fpga/linux/types.go rename to pkg/fpga/types.go index 898bb921..f711778f 100644 --- a/pkg/fpga/linux/types.go +++ b/pkg/fpga/types.go @@ -22,7 +22,7 @@ // Code generated by carefully reading documentation and cherry-picking right kernel headers. DO NOT EDIT. // -package linux +package fpga /* #include "fpga-dfl.h" diff --git a/pkg/fpga/linux/utils.go b/pkg/fpga/utils.go similarity index 99% rename from pkg/fpga/linux/utils.go rename to pkg/fpga/utils.go index 61348619..df1ff330 100644 --- a/pkg/fpga/linux/utils.go +++ b/pkg/fpga/utils.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package linux +package fpga import ( "io/ioutil" diff --git a/pkg/fpga/linux/ztypes.go b/pkg/fpga/ztypes.go similarity index 99% rename from pkg/fpga/linux/ztypes.go rename to pkg/fpga/ztypes.go index eb91a615..e77524fe 100644 --- a/pkg/fpga/linux/ztypes.go +++ b/pkg/fpga/ztypes.go @@ -1,7 +1,7 @@ // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Iuapi types.go -package linux +package fpga const ( DFL_FPGA_GET_API_VERSION = 0xb600