Merged master changes

src/raspberrypi/Makefile

@@ -1,7 +1,10 @@
 .DEFAULT_GOAL: all
 
-CC       = gcc
-CXX      = g++
+ARCH ?= arm
+CROSS_COMPILE ?= arm-linux-gnueabihf-
+
+CC  = $(CROSS_COMPILE)gcc
+CXX = $(CROSS_COMPILE)g++
 
 DEBUG ?= 0
 ifeq ($(DEBUG), 1)
@@ -15,8 +18,8 @@ else
 	CXXFLAGS += -O3 -Wall -Werror
 	BUILD_TYPE = Release
 endif
-CFLAGS += -Idevices -Icontrollers -I.
-CXXFLAGS += -Idevices -Icontrollers -I. -std=c++14
+CFLAGS += -iquote .
+CXXFLAGS += -std=c++14 -iquote .
 
 # If its not specified, build for STANDARD configuration
 CONNECT_TYPE ?= STANDARD

src/raspberrypi/controllers/sasidev_ctrl.cpp

@@ -13,10 +13,10 @@
 //  [ SASI device controller ]
 //
 //---------------------------------------------------------------------------
-#include "sasidev_ctrl.h"
+#include "controllers/sasidev_ctrl.h"
 #include "filepath.h"
 #include "gpiobus.h"
-#include "scsi_host_bridge.h"
+#include "devices/scsi_host_bridge.h"
 
 //===========================================================================
 //

src/raspberrypi/controllers/sasidev_ctrl.h

@@ -18,7 +18,7 @@
 #include "os.h"
 #include "scsi.h"
 #include "fileio.h"
-#include "disk.h"
+#include "devices/disk.h"
 #include "log.h"
 #include "xm6.h"
 

src/raspberrypi/controllers/scsidev_ctrl.cpp

@@ -13,9 +13,9 @@
 //  [ SCSI device controller ]
 //
 //---------------------------------------------------------------------------
-#include "scsidev_ctrl.h"
+#include "controllers/scsidev_ctrl.h"
 #include "gpiobus.h"
-#include "scsi_host_bridge.h"
+#include "devices/scsi_host_bridge.h"
 
 //===========================================================================
 //

src/raspberrypi/controllers/scsidev_ctrl.h

@@ -14,7 +14,7 @@
 //
 //---------------------------------------------------------------------------
 #pragma once
-#include "sasidev_ctrl.h"
+#include "controllers/sasidev_ctrl.h"
 
 //===========================================================================
 //

src/raspberrypi/filepath.h

@@ -11,6 +11,8 @@
 
 class Fileio;
 
+class Fileio;
+
 //---------------------------------------------------------------------------
 //
 //	定数定義

src/raspberrypi/rascsi.cpp

@@ -15,16 +15,16 @@
 #include "xm6.h"
 #include "filepath.h"
 #include "fileio.h"
-#include "disk.h"
-#include "sasihd.h"
-#include "scsihd.h"
-#include "scsihd_apple.h"
-#include "scsihd_nec.h"
-#include "scsicd.h"
-#include "scsimo.h"
-#include "scsi_host_bridge.h"
-#include "scsidev_ctrl.h"
-#include "sasidev_ctrl.h"
+#include "devices/disk.h"
+#include "devices/sasihd.h"
+#include "devices/scsihd.h"
+#include "devices/scsihd_apple.h"
+#include "devices/scsihd_nec.h"
+#include "devices/scsicd.h"
+#include "devices/scsimo.h"
+#include "devices/scsi_host_bridge.h"
+#include "controllers/scsidev_ctrl.h"
+#include "controllers/sasidev_ctrl.h"
 #include "gpiobus.h"
 #include "command_thread.h"
 #include "rascsi_mgr.h"
@@ -41,6 +41,7 @@
 #include "scsi_host_bridge.h"
 
 
+
 //---------------------------------------------------------------------------
 //
 //  Constant declarations