mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-17 04:36:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

More upstream include path conversions.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2076 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2010-09-09 15:27:54 +00:00
parent e72226e60b
commit 5b33692678
34 changed files with 128 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fcst/Makefile_in-tree
-2
View File
@@ -1,5 +1,3 @@
ccflags-y += -Iinclude/scst
obj-$(CONFIG_FCST) += fcst.o
fcst-objs := \
fcst/fcst.h
+4
View File
@@ -19,7 +19,11 @@
#ifndef __SCSI_FCST_H__
#define __SCSI_FCST_H__
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#define FT_VERSION "0.3"
#define FT_MODULE "fcst"
ibmvstgt/src/ibmvstgt.c
+4
View File
@@ -27,7 +27,11 @@
#include <scsi/scsi.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_transport_srp.h>
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include <scsi/libsrp.h>
#include <asm/iommu.h>
#ifdef __powerpc__
ibmvstgt/src/libsrpnew.c
+4
View File
@@ -29,7 +29,11 @@
#include <scsi/scsi_tgt.h>
#include <scsi/srp.h>
#include "libsrpnew.h"
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
enum srp_task_attributes {
SRP_SIMPLE_TASK = 0,
iscsi-scst/kernel/Makefile.in-kernel
-2
View File
@@ -1,5 +1,3 @@
EXTRA_CFLAGS += -Iinclude/scst
iscsi-scst-y := iscsi.o nthread.o config.o digest.o \
conn.o session.o target.o event.o param.o
iscsi-scst/kernel/event.c
+4
View File
@@ -17,7 +17,11 @@
*/
#include <net/tcp.h>
#ifdef INSIDE_KERNEL_TREE
#include <scst/iscsi_scst.h>
#else
#include "iscsi_scst.h"
#endif
#include "iscsi.h"
static struct sock *nl;
iscsi-scst/kernel/iscsi.h
+6 -3
View File
@@ -22,11 +22,14 @@
#include <linux/net.h>
#include <net/sock.h>
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#include <scst/iscsi_scst.h>
#else
#include <scst.h>
#include "iscsi_hdr.h"
#include "iscsi_scst.h"
#endif
#include "iscsi_hdr.h"
#include "iscsi_dbg.h"
#define iscsi_sense_crc_error ABORTED_COMMAND, 0x47, 0x05
iscsi-scst/kernel/iscsi_dbg.h
+4
View File
@@ -18,7 +18,11 @@
#define LOG_PREFIX "iscsi-scst"
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst_debug.h>
#else
#include <scst_debug.h>
#endif
#define TRACE_D_WRITE 0x80000000
#define TRACE_CONN_OC 0x40000000
iscsi-scst/usr/iscsid.h
+5 -1
View File
@@ -24,8 +24,12 @@
#include <netdb.h>
#include "types.h"
#include "iscsi_hdr.h"
#ifdef INSIDE_KERNEL_TREE
#include <scst/iscsi_scst.h>
#else
#include "iscsi_scst.h"
#endif
#include "iscsi_hdr.h"
#include "param.h"
#include "misc.h"
mpt/in-tree/Makefile
+1 -2
View File
@@ -1,6 +1,5 @@
SCST_INC_DIR := include/scst
FUSION_INC_DIR := drivers/message/fusion
EXTRA_CFLAGS += -I$(SCST_INC_DIR) -I$(FUSION_INC_DIR) -Iinclude/scsi
EXTRA_CFLAGS += -I$(FUSION_INC_DIR) -Iinclude/scsi
EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
mpt/mpt_scst.c
+5 -1
View File
@@ -36,9 +36,13 @@
#include <linux/pci.h>
#endif
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#include <scst/scst_debug.h>
#else
#include "scst.h"
#include <scst_debug.h>
#endif
#include "mpt_scst.h"
mvsas_tgt/mv_tgt.h
+5
View File
@@ -25,8 +25,13 @@
#ifdef SUPPORT_TARGET
#ifndef _MVSAST_H
#define _MVSAST_H
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#include <scst/scst_debug.h>
#else
#include "scst.h"
#include "scst_debug.h"
#endif
#include "mv_sas.h"
struct mvs_info;
qla2x00t/qla2x00-target/Makefile_in-tree-2.6.35
+1 -1
View File
@@ -1,4 +1,4 @@
ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
ccflags-y += -Idrivers/scsi/qla2xxx
qla2x00tgt-y := qla2x00t.o
scst/kernel/in-tree/Makefile.scst-2.6.35
+1 -1
View File
@@ -1,4 +1,4 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
ccflags-y += -Wno-unused-parameter
scst-y += scst_main.o
scst-y += scst_pres.o
scst/src/dev_handlers/scst_cdrom.c
+4
View File
@@ -24,7 +24,11 @@
#define LOG_PREFIX "dev_cdrom"
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include "scst_dev_handler.h"
#define CDROM_NAME "dev_cdrom"
scst/src/dev_handlers/scst_changer.c
+4
View File
@@ -23,7 +23,11 @@
#define LOG_PREFIX "dev_changer"
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include "scst_dev_handler.h"
#define CHANGER_NAME "dev_changer"
scst/src/dev_handlers/scst_disk.c
+4
View File
@@ -28,7 +28,11 @@
#define LOG_PREFIX "dev_disk"
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include "scst_dev_handler.h"
# define DISK_NAME "dev_disk"
scst/src/dev_handlers/scst_modisk.c
+4
View File
@@ -28,7 +28,11 @@
#define LOG_PREFIX "dev_modisk"
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include "scst_dev_handler.h"
# define MODISK_NAME "dev_modisk"
scst/src/dev_handlers/scst_processor.c
+4
View File
@@ -23,7 +23,11 @@
#define LOG_PREFIX "dev_processor"
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include "scst_dev_handler.h"
#define PROCESSOR_NAME "dev_processor"
scst/src/dev_handlers/scst_raid.c
+4
View File
@@ -23,7 +23,11 @@
#include <scsi/scsi_host.h>
#include <linux/slab.h>
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include "scst_dev_handler.h"
#define RAID_NAME "dev_raid"
scst/src/dev_handlers/scst_tape.c
+4
View File
@@ -28,7 +28,11 @@
#define LOG_PREFIX "dev_tape"
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include "scst_dev_handler.h"
# define TAPE_NAME "dev_tape"
scst/src/dev_handlers/scst_user.c
+5
View File
@@ -25,8 +25,13 @@
#define LOG_PREFIX DEV_USER_NAME
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#include <scst/scst_user.h>
#else
#include "scst.h"
#include "scst_user.h"
#endif
#include "scst_dev_handler.h"
#if defined(CONFIG_HIGHMEM4G) || defined(CONFIG_HIGHMEM64G)
scst/src/dev_handlers/scst_vdisk.c
+4
View File
@@ -45,7 +45,11 @@
#define LOG_PREFIX "dev_vdisk"
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING)
scst/src/scst_debug.c
+5
View File
@@ -19,8 +19,13 @@
* GNU General Public License for more details.
*/
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#include <scst/scst_debug.h>
#else
#include "scst.h"
#include "scst_debug.h"
#endif
#if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING)
scst/src/scst_lib.c
+4 -1
View File
@@ -32,10 +32,13 @@
#include <asm/kmap_types.h>
#include <asm/unaligned.h>
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include "scst_priv.h"
#include "scst_mem.h"
#include "scst_pres.h"
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
scst/src/scst_main.c
+4
View File
@@ -30,7 +30,11 @@
#include <linux/kthread.h>
#include <linux/delay.h>
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include "scst_priv.h"
#include "scst_mem.h"
#include "scst_pres.h"
scst/src/scst_mem.c
+4
View File
@@ -26,7 +26,11 @@
#include <linux/unistd.h>
#include <linux/string.h>
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include "scst_priv.h"
#include "scst_mem.h"
scst/src/scst_pres.c
+5
View File
@@ -50,8 +50,13 @@
#include <linux/writeback.h>
#endif
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#include <scst/scst_const.h>
#else
#include "scst.h"
#include "scst_const.h"
#endif
#include "scst_priv.h"
#include "scst_pres.h"
scst/src/scst_priv.h
+4
View File
@@ -33,7 +33,11 @@
#define LOG_PREFIX "scst"
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst_debug.h>
#else
#include "scst_debug.h"
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
#define SCST_MAJOR 177
scst/src/scst_proc.c
+4
View File
@@ -30,7 +30,11 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include "scst_priv.h"
#include "scst_mem.h"
#include "scst_pres.h"
scst/src/scst_sysfs.c
+4
View File
@@ -25,7 +25,11 @@
#include <linux/slab.h>
#include <linux/kthread.h>
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include "scst_priv.h"
#include "scst_mem.h"
#include "scst_pres.h"
scst/src/scst_targ.c
+4
View File
@@ -30,7 +30,11 @@
#include <linux/delay.h>
#include <linux/ktime.h>
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst.h>
#else
#include "scst.h"
#endif
#include "scst_priv.h"
#include "scst_pres.h"
scst_local/in-tree/Makefile-2.6.35
-4
View File
@@ -1,6 +1,2 @@
SCST_INC_DIR := include/scst
SCST_DIR := drivers/scst
ccflags-y += -I$(SCST_INC_DIR) -I$(SCST_DIR)
obj-$(CONFIG_SCST_LOCAL) += scst_local.o
scst_local/scst_local.c
+9 -4
View File
@@ -30,13 +30,18 @@
#include <scsi/scsi_host.h>
#include <scsi/scsi_tcq.h>
/* SCST includes ... */
#include <scst_const.h>
#include <scst.h>
#define LOG_PREFIX "scst_local"
/* SCST includes ... */
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst_const.h>
#include <scst/scst.h>
#include <scst/scst_debug.h>
#else
#include <scst_const.h>
#include <scst.h>
#include <scst_debug.h>
#endif
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
#define SG_MAX_SINGLE_ALLOC (PAGE_SIZE / sizeof(struct scatterlist))