Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bff9d54 authored by Dan Williams's avatar Dan Williams
Browse files

isci: uplevel state machine 



unify core/sci_base_state.h and core/sci_base_state_machine.[ch] into
state_machine.[ch]

Reported-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 63a3a15f

drivers/scsi/isci/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ obj-$(CONFIG_SCSI_ISCI) += isci.o 
isci-objs := init.o phy.o request.o sata.o \

	     remote_device.o port.o timers.o \

	     host.o task.o probe_roms.o \

	     state_machine.o \

	     remote_node_context.o \

	     remote_node_table.o \

	     unsolicited_frame_control.o \
@@ -13,5 +14,4 @@ isci-objs := init.o phy.o request.o sata.o \ 
	     core/scic_sds_phy.o \

	     core/scic_sds_ssp_request.o \

	     core/scic_sds_smp_request.o \

	     core/sci_base_state_machine.o \

	     core/sci_util.o

drivers/scsi/isci/core/sci_base_state.h

deleted100644 → 0
+0 −84
Original line number Diff line number Diff line 
/*

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.

 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

 * The full GNU General Public License is included in this distribution

 * in the file called LICENSE.GPL.

 *

 * BSD LICENSE

 *

 * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 *   * Redistributions of source code must retain the above copyright

 *     notice, this list of conditions and the following disclaimer.

 *   * Redistributions in binary form must reproduce the above copyright

 *     notice, this list of conditions and the following disclaimer in

 *     the documentation and/or other materials provided with the

 *     distribution.

 *   * Neither the name of Intel Corporation nor the names of its

 *     contributors may be used to endorse or promote products derived

 *     from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#ifndef _SCI_BASE_STATE_H_

#define _SCI_BASE_STATE_H_



typedef void (*sci_base_state_handler_t)(void);



typedef void (*sci_state_transition_t)(void *base_object);



/**

 * struct sci_base_state - The base state object abstracts the fields common to

 *    all state objects defined in SCI.

 *

 *

 */

struct sci_base_state {

	/**

	 * This field is a function pointer that defines the method to be

	 * invoked when the state is entered.

	 */

	sci_state_transition_t enter_state;



	/**

	 * This field is a function pointer that defines the method to be

	 * invoked when the state is exited.

	 */

	sci_state_transition_t exit_state;



};



#endif /* _SCI_BASE_STATE_H_ */

drivers/scsi/isci/core/scic_sds_phy.c

+1 −2
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ 
#include <scsi/sas.h>

#include "sas.h"

#include "host.h"

#include "sci_base_state.h"

#include "sci_base_state_machine.h"

#include "state_machine.h"

#include "scic_phy.h"

#include "scic_sds_phy.h"

#include "scic_sds_port.h"

drivers/scsi/isci/core/scic_sds_phy.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
#include "sas.h"

#include "scic_phy.h"

#include "registers.h"

#include "sci_base_state_machine.h"

#include "state_machine.h"

#include <scsi/libsas.h>



struct scic_sds_port;

drivers/scsi/isci/core/scic_sds_port.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#include "isci.h"

#include "sas.h"

#include "registers.h"

#include "sci_base_state_machine.h"

#include "state_machine.h"



struct scic_sds_controller;

struct scic_sds_phy;