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

Commit 70d83707 authored by Cho, Yu-Chen's avatar Cho, Yu-Chen Committed by Greg Kroah-Hartman
Browse files

staging/keucr: fix keucr msscsi coding style 



Fix keucr msscsi.c coding style.
Remove externs ,and move MS_SCSIIrp to end,
because there are not necessary to add extern for MS_SCSIIrp function.

Signed-off-by: default avatarCho, Yu-Chen <acho@novell.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 333c5ec0

drivers/staging/keucr/msscsi.c

+117 −102
Original line number Diff line number Diff line
@@ -12,45 +12,15 @@ 
#include "scsiglue.h"

#include "transport.h"



int MS_SCSI_Test_Unit_Ready (struct us_data *us, struct scsi_cmnd *srb);

int MS_SCSI_Inquiry         (struct us_data *us, struct scsi_cmnd *srb);

int MS_SCSI_Mode_Sense      (struct us_data *us, struct scsi_cmnd *srb);

int MS_SCSI_Start_Stop      (struct us_data *us, struct scsi_cmnd *srb);

int MS_SCSI_Read_Capacity   (struct us_data *us, struct scsi_cmnd *srb);

int MS_SCSI_Read            (struct us_data *us, struct scsi_cmnd *srb);

int MS_SCSI_Write           (struct us_data *us, struct scsi_cmnd *srb);



//----- MS_SCSIIrp() --------------------------------------------------

int MS_SCSIIrp(struct us_data *us, struct scsi_cmnd *srb)

{

	int    result;



	us->SrbStatus = SS_SUCCESS;

	switch (srb->cmnd[0])

	{

		case TEST_UNIT_READY :  result = MS_SCSI_Test_Unit_Ready (us, srb);  break; //0x00

		case INQUIRY         :  result = MS_SCSI_Inquiry         (us, srb);  break; //0x12

		case MODE_SENSE      :  result = MS_SCSI_Mode_Sense      (us, srb);  break; //0x1A

		case READ_CAPACITY   :  result = MS_SCSI_Read_Capacity   (us, srb);  break; //0x25

		case READ_10         :  result = MS_SCSI_Read            (us, srb);  break; //0x28

		case WRITE_10        :  result = MS_SCSI_Write           (us, srb);  break; //0x2A



		default:

			us->SrbStatus = SS_ILLEGAL_REQUEST;

			result = USB_STOR_TRANSPORT_FAILED;

			break;

	}

	return result;

}



//----- MS_SCSI_Test_Unit_Ready() --------------------------------------------------

/*

 * MS_SCSI_Test_Unit_Ready()

 */

int MS_SCSI_Test_Unit_Ready(struct us_data *us, struct scsi_cmnd *srb)

{

	/* pr_info("MS_SCSI_Test_Unit_Ready\n"); */

	if (us->MS_Status.Insert && us->MS_Status.Ready)

		return USB_STOR_TRANSPORT_GOOD;

	else

	{

	else {

		ENE_MSInit(us);

		return USB_STOR_TRANSPORT_GOOD;

	}
@@ -58,22 +28,32 @@ int MS_SCSI_Test_Unit_Ready(struct us_data *us, struct scsi_cmnd *srb) 
	return USB_STOR_TRANSPORT_GOOD;

}



//----- MS_SCSI_Inquiry() --------------------------------------------------

/*

 * MS_SCSI_Inquiry()

 */

int MS_SCSI_Inquiry(struct us_data *us, struct scsi_cmnd *srb)

{

	/* pr_info("MS_SCSI_Inquiry\n"); */

	BYTE data_ptr[36] = {0x00, 0x80, 0x02, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x55, 0x53, 0x42, 0x32, 0x2E, 0x30, 0x20, 0x20, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x61, 0x64, 0x65, 0x72, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x31, 0x30, 0x30};

	BYTE data_ptr[36] = {0x00, 0x80, 0x02, 0x00, 0x1F, 0x00,

				0x00, 0x00, 0x55, 0x53, 0x42, 0x32,

				0x2E, 0x30, 0x20, 0x20, 0x43, 0x61,

				0x72, 0x64, 0x52, 0x65, 0x61, 0x64,

				0x65, 0x72, 0x20, 0x20, 0x20, 0x20,

				0x20, 0x20, 0x30, 0x31, 0x30, 0x30};



	usb_stor_set_xfer_buf(us, data_ptr, 36, srb, TO_XFER_BUF);

	return USB_STOR_TRANSPORT_GOOD;

}





//----- MS_SCSI_Mode_Sense() --------------------------------------------------

/*

 * MS_SCSI_Mode_Sense()

 */

int MS_SCSI_Mode_Sense(struct us_data *us, struct scsi_cmnd *srb)

{

	BYTE	mediaNoWP[12] = {0x0b,0x00,0x00,0x08,0x00,0x00,0x71,0xc0,0x00,0x00,0x02,0x00};

	BYTE	mediaWP[12]   = {0x0b,0x00,0x80,0x08,0x00,0x00,0x71,0xc0,0x00,0x00,0x02,0x00};

	BYTE	mediaNoWP[12] = {0x0b, 0x00, 0x00, 0x08, 0x00, 0x00,

					0x71, 0xc0, 0x00, 0x00, 0x02, 0x00};

	BYTE	mediaWP[12]   = {0x0b, 0x00, 0x80, 0x08, 0x00, 0x00,

					0x71, 0xc0, 0x00, 0x00, 0x02, 0x00};



	if (us->MS_Status.WtP)

		usb_stor_set_xfer_buf(us, mediaWP, 12, srb, TO_XFER_BUF);
@@ -84,7 +64,9 @@ int MS_SCSI_Mode_Sense(struct us_data *us, struct scsi_cmnd *srb) 
	return USB_STOR_TRANSPORT_GOOD;

}



//----- MS_SCSI_Read_Capacity() --------------------------------------------------

/*

 * MS_SCSI_Read_Capacity()

 */

int MS_SCSI_Read_Capacity(struct us_data *us, struct scsi_cmnd *srb)

{

	unsigned int offset = 0;
@@ -99,13 +81,14 @@ int MS_SCSI_Read_Capacity(struct us_data *us, struct scsi_cmnd *srb) 
	if (us->MS_Status.IsMSPro)

		bl_num = us->MSP_TotalBlock - 1;

	else

		bl_num = us->MS_Lib.NumberOfLogBlock * us->MS_Lib.blockSize * 2 - 1;

		bl_num = us->MS_Lib.NumberOfLogBlock *

				us->MS_Lib.blockSize * 2 - 1;



	us->bl_num = bl_num;

	pr_info("bl_len = %x\n", bl_len);

	pr_info("bl_num = %x\n", bl_num);



	//srb->request_bufflen = 8;

	/* srb->request_bufflen = 8; */

	buf[0] = (bl_num >> 24) & 0xff;

	buf[1] = (bl_num >> 16) & 0xff;

	buf[2] = (bl_num >> 8) & 0xff;
@@ -116,19 +99,24 @@ int MS_SCSI_Read_Capacity(struct us_data *us, struct scsi_cmnd *srb) 
	buf[7] = (bl_len >> 0) & 0xff;



	usb_stor_access_xfer_buf(us, buf, 8, srb, &sg, &offset, TO_XFER_BUF);

	//usb_stor_set_xfer_buf(us, buf, srb->request_bufflen, srb, TO_XFER_BUF);

	/* usb_stor_set_xfer_buf(us, buf, srb->request_bufflen,

						srb, TO_XFER_BUF); */



	return USB_STOR_TRANSPORT_GOOD;

}



//----- MS_SCSI_Read() --------------------------------------------------

/*

 * MS_SCSI_Read()

 */

int MS_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb)

{

	struct bulk_cb_wrap *bcb = (struct bulk_cb_wrap *) us->iobuf;

	int result = 0;

	PBYTE	Cdb = srb->cmnd;

	DWORD bn  =  ((Cdb[2]<<24) & 0xff000000) | ((Cdb[3]<<16) & 0x00ff0000) |

                   ((Cdb[4]<< 8) & 0x0000ff00) | ((Cdb[5]<< 0) & 0x000000ff);

	DWORD bn  =  ((Cdb[2] << 24) & 0xff000000) |

			((Cdb[3] << 16) & 0x00ff0000) |

			((Cdb[4] << 8) & 0x0000ff00) |

			((Cdb[5] << 0) & 0x000000ff);

	WORD  blen = ((Cdb[7] << 8) & 0xff00) | ((Cdb[8] << 0) & 0x00ff);

	DWORD	blenByte = blen * 0x200;
@@ -138,16 +126,14 @@ int MS_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb) 
	if (bn > us->bl_num)

		return USB_STOR_TRANSPORT_ERROR;



	if (us->MS_Status.IsMSPro)

	{

	if (us->MS_Status.IsMSPro) {

		result = ENE_LoadBinCode(us, MSP_RW_PATTERN);

		if (result != USB_STOR_XFER_GOOD)

		{

		if (result != USB_STOR_XFER_GOOD) {

			pr_info("Load MSP RW pattern Fail !!\n");

			return USB_STOR_TRANSPORT_ERROR;

		}



		// set up the command wrapper

		/*  set up the command wrapper */

		memset(bcb, 0, sizeof(struct bulk_cb_wrap));

		bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);

		bcb->DataTransferLength = blenByte;
@@ -160,9 +146,7 @@ int MS_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb) 
		bcb->CDB[2] = (BYTE)(bn>>24);



		result = ENE_SendScsiCmd(us, FDIR_READ, scsi_sglist(srb), 1);

	}

	else

	{

	} else {

		void	*buf;

		int	offset = 0;

		WORD	phyblk, logblk;
@@ -175,8 +159,7 @@ int MS_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb) 
			return USB_STOR_TRANSPORT_ERROR;



		result = ENE_LoadBinCode(us, MS_RW_PATTERN);

		if (result != USB_STOR_XFER_GOOD)

		{

		if (result != USB_STOR_XFER_GOOD) {

			pr_info("Load MS RW pattern Fail !!\n");

			result = USB_STOR_TRANSPORT_ERROR;

			goto exit;
@@ -185,8 +168,7 @@ int MS_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb) 
		logblk  = (WORD)(bn / us->MS_Lib.PagesPerBlock);

		PageNum = (BYTE)(bn % us->MS_Lib.PagesPerBlock);



		while(1)

		{

		while (1) {

			if (blen > (us->MS_Lib.PagesPerBlock-PageNum))

				len = us->MS_Lib.PagesPerBlock-PageNum;

			else
@@ -195,7 +177,7 @@ int MS_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb) 
			phyblk = MS_LibConv2Physical(us, logblk);

			blkno  = phyblk * 0x20 + PageNum;



			// set up the command wrapper

			/* set up the command wrapper */

			memset(bcb, 0, sizeof(struct bulk_cb_wrap));

			bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);

			bcb->DataTransferLength = 0x200 * len;
@@ -208,8 +190,7 @@ int MS_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb) 
			bcb->CDB[2] = (BYTE)(blkno>>24);



			result = ENE_SendScsiCmd(us, FDIR_READ, buf+offset, 0);

			if (result != USB_STOR_XFER_GOOD)

			{

			if (result != USB_STOR_XFER_GOOD) {

				pr_info("MS_SCSI_Read --- result = %x\n",

								result);

				result =  USB_STOR_TRANSPORT_ERROR;
@@ -230,30 +211,32 @@ int MS_SCSI_Read(struct us_data *us, struct scsi_cmnd *srb) 
	return result;

}



//----- MS_SCSI_Write() --------------------------------------------------

/*

 * MS_SCSI_Write()

 */

int MS_SCSI_Write(struct us_data *us, struct scsi_cmnd *srb)

{

	struct bulk_cb_wrap *bcb = (struct bulk_cb_wrap *) us->iobuf;

	int result = 0;

	PBYTE	Cdb = srb->cmnd;

	DWORD bn  =  ((Cdb[2]<<24) & 0xff000000) | ((Cdb[3]<<16) & 0x00ff0000) |

                   ((Cdb[4]<< 8) & 0x0000ff00) | ((Cdb[5]<< 0) & 0x000000ff);

	DWORD bn  = ((Cdb[2] << 24) & 0xff000000) |

			((Cdb[3] << 16) & 0x00ff0000) |

			((Cdb[4] << 8) & 0x0000ff00) |

			((Cdb[5] << 0) & 0x000000ff);

	WORD  blen = ((Cdb[7] << 8) & 0xff00)     | ((Cdb[8] << 0) & 0x00ff);

	DWORD	blenByte = blen * 0x200;



	if (bn > us->bl_num)

		return USB_STOR_TRANSPORT_ERROR;



	if (us->MS_Status.IsMSPro)

	{

	if (us->MS_Status.IsMSPro) {

		result = ENE_LoadBinCode(us, MSP_RW_PATTERN);

		if (result != USB_STOR_XFER_GOOD)

		{

		if (result != USB_STOR_XFER_GOOD) {

			pr_info("Load MSP RW pattern Fail !!\n");

			return USB_STOR_TRANSPORT_ERROR;

		}



		// set up the command wrapper

		/* set up the command wrapper */

		memset(bcb, 0, sizeof(struct bulk_cb_wrap));

		bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);

		bcb->DataTransferLength = blenByte;
@@ -266,9 +249,7 @@ int MS_SCSI_Write(struct us_data *us, struct scsi_cmnd *srb) 
		bcb->CDB[2] = (BYTE)(bn>>24);



		result = ENE_SendScsiCmd(us, FDIR_WRITE, scsi_sglist(srb), 1);

	}

	else

	{

	} else {

		void	*buf;

		int	offset = 0;

		WORD	PhyBlockAddr;
@@ -282,8 +263,7 @@ int MS_SCSI_Write(struct us_data *us, struct scsi_cmnd *srb) 
		usb_stor_set_xfer_buf(us, buf, blenByte, srb, FROM_XFER_BUF);



		result = ENE_LoadBinCode(us, MS_RW_PATTERN);

		if (result != USB_STOR_XFER_GOOD)

		{

		if (result != USB_STOR_XFER_GOOD) {

			pr_info("Load MS RW pattern Fail !!\n");

			result = USB_STOR_TRANSPORT_ERROR;

			goto exit;
@@ -292,8 +272,7 @@ int MS_SCSI_Write(struct us_data *us, struct scsi_cmnd *srb) 
		PhyBlockAddr = (WORD)(bn / us->MS_Lib.PagesPerBlock);

		PageNum      = (BYTE)(bn % us->MS_Lib.PagesPerBlock);



		while(1)

		{

		while (1) {

			if (blen > (us->MS_Lib.PagesPerBlock-PageNum))

				len = us->MS_Lib.PagesPerBlock-PageNum;

			else
@@ -302,9 +281,10 @@ int MS_SCSI_Write(struct us_data *us, struct scsi_cmnd *srb) 
			oldphy = MS_LibConv2Physical(us, PhyBlockAddr);

			newphy = MS_LibSearchBlockFromLogical(us, PhyBlockAddr);



			result = MS_ReaderCopyBlock(us, oldphy, newphy, PhyBlockAddr, PageNum, buf+offset, len);

			if (result != USB_STOR_XFER_GOOD)

			{

			result = MS_ReaderCopyBlock(us, oldphy, newphy,

							PhyBlockAddr, PageNum,

							buf+offset, len);

			if (result != USB_STOR_XFER_GOOD) {

				pr_info("MS_SCSI_Write --- result = %x\n",

								result);

				result =  USB_STOR_TRANSPORT_ERROR;
@@ -327,3 +307,38 @@ int MS_SCSI_Write(struct us_data *us, struct scsi_cmnd *srb) 
	return result;

}



/*

 * MS_SCSIIrp()

 */

int MS_SCSIIrp(struct us_data *us, struct scsi_cmnd *srb)

{

	int    result;



	us->SrbStatus = SS_SUCCESS;

	switch (srb->cmnd[0]) {

	case TEST_UNIT_READY:

		result = MS_SCSI_Test_Unit_Ready(us, srb);

		break; /* 0x00 */

	case INQUIRY:

		result = MS_SCSI_Inquiry(us, srb);

		break; /* 0x12 */

	case MODE_SENSE:

		result = MS_SCSI_Mode_Sense(us, srb);

		break; /* 0x1A */

	case READ_CAPACITY:

		result = MS_SCSI_Read_Capacity(us, srb);

		break; /* 0x25 */

	case READ_10:

		result = MS_SCSI_Read(us, srb);

		break; /* 0x28 */

	case WRITE_10:

		result = MS_SCSI_Write(us, srb);

		break;	/* 0x2A */

	default:

		us->SrbStatus = SS_ILLEGAL_REQUEST;

		result = USB_STOR_TRANSPORT_FAILED;

		break;

	}

	return result;

}