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

Commit 52b4dab3 authored by Ching Huang's avatar Ching Huang Committed by Martin K. Petersen
Browse files

scsi: arcmsr: Redefine ACB_ADAPTER_TYPE_A, _B, _C, _D 



Redefine ACB_ADAPTER_TYPE_A, _B, _C, _D and subsequent changes.

Signed-off-by: default avatarChing Huang <ching2048@areca.com.tw>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 417dff6c

drivers/scsi/arcmsr/arcmsr.h

+4 −4
Original line number Diff line number Diff line
@@ -621,10 +621,10 @@ struct MessageUnit_D { 
struct AdapterControlBlock

{

	uint32_t  adapter_type;                /* adapter A,B..... */

	#define ACB_ADAPTER_TYPE_A            0x00000001	/* hba I IOP */

	#define ACB_ADAPTER_TYPE_B            0x00000002	/* hbb M IOP */

	#define ACB_ADAPTER_TYPE_C            0x00000004	/* hbc P IOP */

	#define ACB_ADAPTER_TYPE_D            0x00000008	/* hbd A IOP */

	#define ACB_ADAPTER_TYPE_A	0x00000000	/* hba I IOP */

	#define ACB_ADAPTER_TYPE_B	0x00000001	/* hbb M IOP */

	#define ACB_ADAPTER_TYPE_C	0x00000002	/* hbc L IOP */

	#define ACB_ADAPTER_TYPE_D	0x00000003	/* hbd M IOP */

	u32				roundup_ccbsize;

	struct pci_dev *		pdev;

	struct Scsi_Host *		host;

drivers/scsi/arcmsr/arcmsr_hba.c

+2 −2
Original line number Diff line number Diff line
@@ -1785,7 +1785,7 @@ arcmsr_Read_iop_rqbuffer_data(struct AdapterControlBlock *acb, 
	uint8_t __iomem *iop_data;

	uint32_t iop_len;



	if (acb->adapter_type & (ACB_ADAPTER_TYPE_C | ACB_ADAPTER_TYPE_D))

	if (acb->adapter_type > ACB_ADAPTER_TYPE_B)

		return arcmsr_Read_iop_rqbuffer_in_DWORD(acb, prbuffer);

	iop_data = (uint8_t __iomem *)prbuffer->data;

	iop_len = readl(&prbuffer->data_len);
@@ -1871,7 +1871,7 @@ arcmsr_write_ioctldata2iop(struct AdapterControlBlock *acb) 
	uint8_t __iomem *iop_data;

	int32_t allxfer_len = 0;



	if (acb->adapter_type & (ACB_ADAPTER_TYPE_C | ACB_ADAPTER_TYPE_D)) {

	if (acb->adapter_type > ACB_ADAPTER_TYPE_B) {

		arcmsr_write_ioctldata2iop_in_DWORD(acb);

		return;

	}