Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 20c3d7f7 编写于 作者: C Cho, Yu-Chen 提交者： Greg Kroah-Hartman
浏览文件
操作

Staging: Remove ENE UB6250 MS card codes from keucr 

Remove ENE UB6250 MS card codes from keucr.
Signed-off-by: NCho, Yu-Chen <acho@novell.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 33842ced
展开全部 隐藏空白更改
内联 并排
Showing with 6 addition and 2680 deletion
drivers/staging/keucr/Kconfig
浏览文件 @ 20c3d7f7
config USB_ENESTORAGE
tristate "USB ENE SM/MS card reader support"
tristate "USB ENE SM card reader support"
depends on USB && SCSI && m
---help---
Say Y here if you wish to control a ENE SM/MS Card reader.
To use SD card, please build driver/usb/storage/ums-eneub6250.ko
Say Y here if you wish to control a ENE SM Card reader.
To use SD/MS card, please build driver/usb/storage/ums-eneub6250.ko
This option depends on 'SCSI' support being enabled, but you
probably also need 'SCSI device support: SCSI disk support'
......
drivers/staging/keucr/Makefile
浏览文件 @ 20c3d7f7
......@@ -7,8 +7,6 @@ keucr-y := \
scsiglue.o \
transport.o \
init.o \
msscsi.o \
ms.o \
smscsi.o \
smilmain.o \
smilsub.o \
......
drivers/staging/keucr/init.c
浏览文件 @ 20c3d7f7
......@@ -31,9 +31,7 @@ int ENE_InitMedia(struct us_data *us)
if (!us->SM_Status.Ready && !us->MS_Status.Ready) {
result = ENE_SMInit(us);
if (result != USB_STOR_XFER_GOOD) {
result = ENE_MSInit(us);
if (result != USB_STOR_XFER_GOOD)
return USB_STOR_TRANSPORT_ERROR;
return USB_STOR_TRANSPORT_ERROR;
}
}
......@@ -61,60 +59,6 @@ int ENE_Read_BYTE(struct us_data *us, WORD index, void *buf)
return result;
}
/*
* ENE_MSInit():
*/
int ENE_MSInit(struct us_data *us)
{
struct bulk_cb_wrap *bcb = (struct bulk_cb_wrap *) us->iobuf;
int result;
BYTE buf[0x200];
WORD MSP_BlockSize, MSP_UserAreaBlocks;
printk(KERN_INFO "transport --- ENE_MSInit\n");
result = ENE_LoadBinCode(us, MS_INIT_PATTERN);
if (result != USB_STOR_XFER_GOOD) {
printk(KERN_ERR "Load MS Init Code Fail !!\n");
return USB_STOR_TRANSPORT_ERROR;
}
memset(bcb, 0, sizeof(struct bulk_cb_wrap));
bcb->Signature = cpu_to_le32(US_BULK_CB_SIGN);
bcb->DataTransferLength = 0x200;
bcb->Flags = 0x80;
bcb->CDB[0] = 0xF1;
bcb->CDB[1] = 0x01;
result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0);
if (result != USB_STOR_XFER_GOOD) {
printk(KERN_ERR "Execution MS Init Code Fail !!\n");
return USB_STOR_TRANSPORT_ERROR;
}
us->MS_Status = *(PMS_STATUS)&buf[0];
if (us->MS_Status.Insert && us->MS_Status.Ready) {
printk(KERN_INFO "Insert = %x\n", us->MS_Status.Insert);
printk(KERN_INFO "Ready = %x\n", us->MS_Status.Ready);
printk(KERN_INFO "IsMSPro = %x\n", us->MS_Status.IsMSPro);
printk(KERN_INFO "IsMSPHG = %x\n", us->MS_Status.IsMSPHG);
printk(KERN_INFO "WtP = %x\n", us->MS_Status.WtP);
if (us->MS_Status.IsMSPro) {
MSP_BlockSize = (buf[6] << 8) | buf[7];
MSP_UserAreaBlocks = (buf[10] << 8) | buf[11];
us->MSP_TotalBlock = MSP_BlockSize * MSP_UserAreaBlocks;
} else {
MS_CardInit(us);
}
printk(KERN_INFO "MS Init Code OK !!\n");
} else {
printk(KERN_INFO "MS Card Not Ready --- %x\n", buf[0]);
return USB_STOR_TRANSPORT_ERROR;
}
return USB_STOR_TRANSPORT_GOOD;
}
/*
*ENE_SMInit()
*/
......@@ -185,19 +129,6 @@ int ENE_LoadBinCode(struct us_data *us, BYTE flag)
if (buf == NULL)
return USB_STOR_TRANSPORT_ERROR;
switch (flag) {
/* For MS */
case MS_INIT_PATTERN:
printk(KERN_INFO "MS_INIT_PATTERN\n");
memcpy(buf, MS_Init, 0x800);
break;
case MSP_RW_PATTERN:
printk(KERN_INFO "MSP_RW_PATTERN\n");
memcpy(buf, MSP_Rdwr, 0x800);
break;
case MS_RW_PATTERN:
printk(KERN_INFO "MS_RW_PATTERN\n");
memcpy(buf, MS_Rdwr, 0x800);
break;
/* For SS */
case SM_INIT_PATTERN:
printk(KERN_INFO "SM_INIT_PATTERN\n");
......
drivers/staging/keucr/init.h
浏览文件 @ 20c3d7f7
此差异已折叠。
drivers/staging/keucr/ms.c 已删除 100644 → 0
浏览文件 @ 33842ced
此差异已折叠。
drivers/staging/keucr/ms.h 已删除 100644 → 0
浏览文件 @ 33842ced
#ifndef MS_INCD
#define MS_INCD
#include <linux/blkdev.h>
#include "common.h"
/* MemoryStick Register */
/* Status Register 0 */
#define MS_REG_ST0_MB 0x80 /* media busy */
#define MS_REG_ST0_FB0 0x40 /* flush busy 0 */
#define MS_REG_ST0_BE 0x20 /* buffer empty */
#define MS_REG_ST0_BF 0x10 /* buffer full */
#define MS_REG_ST0_SL 0x02 /* sleep */
#define MS_REG_ST0_WP 0x01 /* write protected */
#define MS_REG_ST0_WP_ON MS_REG_ST0_WP
#define MS_REG_ST0_WP_OFF 0x00
/* Status Register 1 */
#define MS_REG_ST1_MB 0x80 /* media busy */
#define MS_REG_ST1_FB1 0x40 /* flush busy 1 */
#define MS_REG_ST1_DTER 0x20 /* error on data(corrected) */
#define MS_REG_ST1_UCDT 0x10 /* unable to correct data */
#define MS_REG_ST1_EXER 0x08 /* error on extra(corrected) */
#define MS_REG_ST1_UCEX 0x04 /* unable to correct extra */
#define MS_REG_ST1_FGER 0x02 /* error on overwrite flag(corrected) */
#define MS_REG_ST1_UCFG 0x01 /* unable to correct overwrite flag */
#define MS_REG_ST1_DEFAULT (MS_REG_ST1_MB | MS_REG_ST1_FB1 | \
MS_REG_ST1_DTER | MS_REG_ST1_UCDT | \
MS_REG_ST1_EXER | MS_REG_ST1_UCEX | \
MS_REG_ST1_FGER | MS_REG_ST1_UCFG)
/* System Parameter */
#define MS_REG_SYSPAR_BAMD 0x80 /* block address mode */
#define MS_REG_SYSPAR_BAND_LINEAR MS_REG_SYSPAR_BAMD /* linear mode */
#define MS_REG_SYSPAR_BAND_CHIP 0x00 /* chip mode */
#define MS_REG_SYSPAR_ATEN 0x40 /* attribute ROM enable */
#define MS_REG_SYSPAR_ATEN_ENABLE MS_REG_SYSPAR_ATEN /* enable */
#define MS_REG_SYSPAR_ATEN_DISABLE 0x00 /* disable */
#define MS_REG_SYSPAR_RESERVED 0x2f
/* Command Parameter */
#define MS_REG_CMDPAR_CP2 0x80
#define MS_REG_CMDPAR_CP1 0x40
#define MS_REG_CMDPAR_CP0 0x20
#define MS_REG_CMDPAR_BLOCK_ACCESS 0
#define MS_REG_CMDPAR_PAGE_ACCESS MS_REG_CMDPAR_CP0
#define MS_REG_CMDPAR_EXTRA_DATA MS_REG_CMDPAR_CP1
#define MS_REG_CMDPAR_OVERWRITE MS_REG_CMDPAR_CP2
#define MS_REG_CMDPAR_RESERVED 0x1f
/* Overwrite Area */
#define MS_REG_OVR_BKST 0x80 /* block status */
#define MS_REG_OVR_BKST_OK MS_REG_OVR_BKST /* OK */
#define MS_REG_OVR_BKST_NG 0x00 /* NG */
#define MS_REG_OVR_PGST0 0x40 /* page status */
#define MS_REG_OVR_PGST1 0x20
#define MS_REG_OVR_PGST_MASK (MS_REG_OVR_PGST0 | MS_REG_OVR_PGST1)
#define MS_REG_OVR_PGST_OK (MS_REG_OVR_PGST0 | MS_REG_OVR_PGST1) /* OK */
#define MS_REG_OVR_PGST_NG MS_REG_OVR_PGST1 /* NG */
#define MS_REG_OVR_PGST_DATA_ERROR 0x00 /* data error */
#define MS_REG_OVR_UDST 0x10 /* update status */
#define MS_REG_OVR_UDST_UPDATING 0x00 /* updating */
#define MS_REG_OVR_UDST_NO_UPDATE MS_REG_OVR_UDST
#define MS_REG_OVR_RESERVED 0x08
#define MS_REG_OVR_DEFAULT (MS_REG_OVR_BKST_OK | \
MS_REG_OVR_PGST_OK | \
MS_REG_OVR_UDST_NO_UPDATE | \
MS_REG_OVR_RESERVED)
/* Management Flag */
#define MS_REG_MNG_SCMS0 0x20 /* serial copy management system */
#define MS_REG_MNG_SCMS1 0x10
#define MS_REG_MNG_SCMS_MASK (MS_REG_MNG_SCMS0 | MS_REG_MNG_SCMS1)
#define MS_REG_MNG_SCMS_COPY_OK (MS_REG_MNG_SCMS0 | MS_REG_MNG_SCMS1)
#define MS_REG_MNG_SCMS_ONE_COPY MS_REG_MNG_SCMS1
#define MS_REG_MNG_SCMS_NO_COPY 0x00
#define MS_REG_MNG_ATFLG 0x08 /* address transfer table flag */
#define MS_REG_MNG_ATFLG_OTHER MS_REG_MNG_ATFLG /* other */
#define MS_REG_MNG_ATFLG_ATTBL 0x00 /* address transfer table */
#define MS_REG_MNG_SYSFLG 0x04 /* system flag */
#define MS_REG_MNG_SYSFLG_USER MS_REG_MNG_SYSFLG /* user block */
#define MS_REG_MNG_SYSFLG_BOOT 0x00 /* system block */
#define MS_REG_MNG_RESERVED 0xc3
#define MS_REG_MNG_DEFAULT (MS_REG_MNG_SCMS_COPY_OK | \
MS_REG_MNG_ATFLG_OTHER | \
MS_REG_MNG_SYSFLG_USER | \
MS_REG_MNG_RESERVED)
/* Error codes */
#define MS_STATUS_SUCCESS 0x0000
#define MS_ERROR_OUT_OF_SPACE 0x0103
#define MS_STATUS_WRITE_PROTECT 0x0106
#define MS_ERROR_READ_DATA 0x8002
#define MS_ERROR_FLASH_READ 0x8003
#define MS_ERROR_FLASH_WRITE 0x8004
#define MS_ERROR_FLASH_ERASE 0x8005
#define MS_ERROR_FLASH_COPY 0x8006
#define MS_STATUS_ERROR 0xfffe
#define MS_FIFO_ERROR 0xfffd
#define MS_UNDEFINED_ERROR 0xfffc
#define MS_KETIMEOUT_ERROR 0xfffb
#define MS_STATUS_INT_ERROR 0xfffa
#define MS_NO_MEMORY_ERROR 0xfff9
#define MS_NOCARD_ERROR 0xfff8
#define MS_LB_NOT_USED 0xffff
#define MS_LB_ERROR 0xfff0
#define MS_LB_BOOT_BLOCK 0xfff1
#define MS_LB_INITIAL_ERROR 0xfff2
#define MS_STATUS_SUCCESS_WITH_ECC 0xfff3
#define MS_LB_ACQUIRED_ERROR 0xfff4
#define MS_LB_NOT_USED_ERASED 0xfff5
#define MS_LibConv2Physical(pdx, LogBlock) \
(((LogBlock) >= (pdx)->MS_Lib.NumberOfLogBlock) ? \
MS_STATUS_ERROR : (pdx)->MS_Lib.Log2PhyMap[LogBlock])
#define MS_LibConv2Logical(pdx, PhyBlock) \
(((PhyBlock) >= (pdx)->MS_Lib.NumberOfPhyBlock) ? \
MS_STATUS_ERROR : (pdx)->MS_Lib.Phy2LogMap[PhyBlock])
/*dphy->log table */
#define MS_LIB_CTRL_RDONLY 0
#define MS_LIB_CTRL_WRPROTECT 1
#define MS_LibCtrlCheck(pdx, Flag) ((pdx)->MS_Lib.flags & (1 << (Flag)))
#define MS_LibCtrlSet(pdx, Flag) ((pdx)->MS_Lib.flags |= (1 << (Flag)))
#define MS_LibCtrlReset(pdx, Flag) ((pdx)->MS_Lib.flags &= ~(1 << (Flag)))
#define MS_LibIsWritable(pdx) \
((MS_LibCtrlCheck((pdx), MS_LIB_CTRL_RDONLY) == 0) && \
(MS_LibCtrlCheck(pdx, MS_LIB_CTRL_WRPROTECT) == 0))
#define MS_MAX_PAGES_PER_BLOCK 32
#define MS_LIB_BITS_PER_BYTE 8
#define MS_LibPageMapIdx(n) ((n) / MS_LIB_BITS_PER_BYTE)
#define MS_LibPageMapBit(n) (1 << ((n) % MS_LIB_BITS_PER_BYTE))
#define MS_LibCheckPageMapBit(pdx, n) \
((pdx)->MS_Lib.pagemap[MS_LibPageMapIdx(n)] & MS_LibPageMapBit(n))
#define MS_LibSetPageMapBit(pdx, n) \
((pdx)->MS_Lib.pagemap[MS_LibPageMapIdx(n)] |= MS_LibPageMapBit(n))
#define MS_LibResetPageMapBit(pdx, n) \
((pdx)->MS_Lib.pagemap[MS_LibPageMapIdx(n)] &= ~MS_LibPageMapBit(n))
#define MS_LibClearPageMap(pdx) \
memset((pdx)->MS_Lib.pagemap, 0, sizeof((pdx)->MS_Lib.pagemap))
#define MemStickLogAddr(logadr1, logadr0) \
((((WORD)(logadr1)) << 8) | (logadr0))
#define MS_BYTES_PER_PAGE 512
#define MS_MAX_INITIAL_ERROR_BLOCKS 10
#define MS_NUMBER_OF_PAGES_FOR_BOOT_BLOCK 3
#define MS_NUMBER_OF_PAGES_FOR_LPCTBL 2
#define MS_NUMBER_OF_BOOT_BLOCK 2
#define MS_NUMBER_OF_SYSTEM_BLOCK 4
#define MS_LOGICAL_BLOCKS_PER_SEGMENT 496
#define MS_LOGICAL_BLOCKS_IN_1ST_SEGMENT 494
#define MS_PHYSICAL_BLOCKS_PER_SEGMENT 0x200 /* 512 */
#define MS_PHYSICAL_BLOCKS_PER_SEGMENT_MASK 0x1ff
#define MS_SECTOR_SIZE 512
#define MBR_SIGNATURE 0xAA55
#define PBR_SIGNATURE 0xAA55
#define PARTITION_FAT_12 1
#define PARTITION_FAT_16 2
#define MS_BOOT_BLOCK_ID 0x0001
#define MS_BOOT_BLOCK_FORMAT_VERSION 0x0100
#define MS_BOOT_BLOCK_DATA_ENTRIES 2
#define MS_SYSINF_MSCLASS_TYPE_1 1
#define MS_SYSINF_CARDTYPE_RDONLY 1
#define MS_SYSINF_CARDTYPE_RDWR 2
#define MS_SYSINF_CARDTYPE_HYBRID 3
#define MS_SYSINF_SECURITY 0x01
#define MS_SYSINF_SECURITY_NO_SUPPORT MS_SYSINF_SECURITY
#define MS_SYSINF_SECURITY_SUPPORT 0
#define MS_SYSINF_FORMAT_MAT 0 /* ? */
#define MS_SYSINF_FORMAT_FAT 1
#define MS_SYSINF_USAGE_GENERAL 0
#define MS_SYSINF_PAGE_SIZE MS_BYTES_PER_PAGE /* fixed */
#define MS_SYSINF_RESERVED1 1
#define MS_SYSINF_RESERVED2 1
#define MS_SYSENT_TYPE_INVALID_BLOCK 0x01
#define MS_SYSENT_TYPE_CIS_IDI 0x0a /* CIS/IDI */
#define SIZE_OF_KIRO 1024
/* BOOT BLOCK */
#define MS_NUMBER_OF_SYSTEM_ENTRY 4
/*
* MemStickRegisters
*/
/* Status registers (16 bytes) */
typedef struct {
BYTE Reserved0; /* 00 */
BYTE INTRegister; /* 01 */
BYTE StatusRegister0; /* 02 */
BYTE StatusRegister1; /* 03 */
BYTE Reserved1[12]; /* 04-0F */
} MemStickStatusRegisters;
/* Parameter registers (6 bytes) */
typedef struct {
BYTE SystemParameter; /* 10 */
BYTE BlockAddress2; /* 11 */
BYTE BlockAddress1; /* 12 */
BYTE BlockAddress0; /* 13 */
BYTE CMDParameter; /* 14 */
BYTE PageAddress; /* 15 */
} MemStickParameterRegisters;
/* Extra registers (9 bytes) */
typedef struct {
BYTE OverwriteFlag; /* 16 */
BYTE ManagementFlag; /* 17 */
BYTE LogicalAddress1; /* 18 */
BYTE LogicalAddress0; /* 19 */
BYTE ReservedArea[5]; /* 1A-1E */
} MemStickExtraDataRegisters;
/* All registers in Memory Stick (32 bytes, includes 1 byte padding) */
typedef struct {
MemStickStatusRegisters status;
MemStickParameterRegisters param;
MemStickExtraDataRegisters extra;
BYTE padding;
} MemStickRegisters, *PMemStickRegisters;
/*
* MemStickBootBlockPage0
*/
typedef struct {
WORD wBlockID;
WORD wFormatVersion;
BYTE bReserved1[184];
BYTE bNumberOfDataEntry;
BYTE bReserved2[179];
} MemStickBootBlockHeader;
typedef struct {
DWORD dwStart;
DWORD dwSize;
BYTE bType;
BYTE bReserved[3];
} MemStickBootBlockSysEntRec;
typedef struct {
MemStickBootBlockSysEntRec entry[MS_NUMBER_OF_SYSTEM_ENTRY];
} MemStickBootBlockSysEnt;
typedef struct {
BYTE bMsClass; /* must be 1 */
BYTE bCardType; /* see below */
WORD wBlockSize; /* n KB */
WORD wBlockNumber; /* number of physical block */
WORD wTotalBlockNumber; /* number of logical block */
WORD wPageSize; /* must be 0x200 */
BYTE bExtraSize; /* 0x10 */
BYTE bSecuritySupport;
BYTE bAssemblyDate[8];
BYTE bFactoryArea[4];
BYTE bAssemblyMakerCode;
BYTE bAssemblyMachineCode[3];
WORD wMemoryMakerCode;
WORD wMemoryDeviceCode;
WORD wMemorySize;
BYTE bReserved1;
BYTE bReserved2;
BYTE bVCC;
BYTE bVPP;
WORD wControllerChipNumber;
WORD wControllerFunction; /* New MS */
BYTE bReserved3[9]; /* New MS */
BYTE bParallelSupport; /* New MS */
WORD wFormatValue; /* New MS */
BYTE bFormatType;
BYTE bUsage;
BYTE bDeviceType;
BYTE bReserved4[22];
BYTE bFUValue3;
BYTE bFUValue4;
BYTE bReserved5[15];
} MemStickBootBlockSysInf;
typedef struct {
MemStickBootBlockHeader header;
MemStickBootBlockSysEnt sysent;
MemStickBootBlockSysInf sysinf;
} MemStickBootBlockPage0;
/*
* MemStickBootBlockCIS_IDI
*/
typedef struct {
BYTE bCistplDEVICE[6]; /* 0 */
BYTE bCistplDEVICE0C[6]; /* 6 */
BYTE bCistplJEDECC[4]; /* 12 */
BYTE bCistplMANFID[6]; /* 16 */
BYTE bCistplVER1[32]; /* 22 */
BYTE bCistplFUNCID[4]; /* 54 */
BYTE bCistplFUNCE0[4]; /* 58 */
BYTE bCistplFUNCE1[5]; /* 62 */
BYTE bCistplCONF[7]; /* 67 */
BYTE bCistplCFTBLENT0[10]; /* 74 */
BYTE bCistplCFTBLENT1[8]; /* 84 */
BYTE bCistplCFTBLENT2[12]; /* 92 */
BYTE bCistplCFTBLENT3[8]; /* 104 */
BYTE bCistplCFTBLENT4[17]; /* 112 */
BYTE bCistplCFTBLENT5[8]; /* 129 */
BYTE bCistplCFTBLENT6[17]; /* 137 */
BYTE bCistplCFTBLENT7[8]; /* 154 */
BYTE bCistplNOLINK[3]; /* 162 */
} MemStickBootBlockCIS;
typedef struct {
#define MS_IDI_GENERAL_CONF 0x848A
WORD wIDIgeneralConfiguration; /* 0 */
WORD wIDInumberOfCylinder; /* 1 */
WORD wIDIreserved0; /* 2 */
WORD wIDInumberOfHead; /* 3 */
WORD wIDIbytesPerTrack; /* 4 */
WORD wIDIbytesPerSector; /* 5 */
WORD wIDIsectorsPerTrack; /* 6 */
WORD wIDItotalSectors[2]; /* 7-8 high,low */
WORD wIDIreserved1[11]; /* 9-19 */
WORD wIDIbufferType; /* 20 */
WORD wIDIbufferSize; /* 21 */
WORD wIDIlongCmdECC; /* 22 */
WORD wIDIfirmVersion[4]; /* 23-26 */
WORD wIDImodelName[20]; /* 27-46 */
WORD wIDIreserved2; /* 47 */
WORD wIDIlongWordSupported; /* 48 */
WORD wIDIdmaSupported; /* 49 */
WORD wIDIreserved3; /* 50 */
WORD wIDIpioTiming; /* 51 */
WORD wIDIdmaTiming; /* 52 */
WORD wIDItransferParameter; /* 53 */
WORD wIDIformattedCylinder; /* 54 */
WORD wIDIformattedHead; /* 55 */
WORD wIDIformattedSectorsPerTrack; /* 56 */
WORD wIDIformattedTotalSectors[2]; /* 57-58 */
WORD wIDImultiSector; /* 59 */
WORD wIDIlbaSectors[2]; /* 60-61 */
WORD wIDIsingleWordDMA; /* 62 */
WORD wIDImultiWordDMA; /* 63 */
WORD wIDIreserved4[192]; /* 64-255 */
} MemStickBootBlockIDI;
typedef struct {
union {
MemStickBootBlockCIS cis;
BYTE dmy[256];
} cis;
union {
MemStickBootBlockIDI idi;
BYTE dmy[256];
} idi;
} MemStickBootBlockCIS_IDI;
/*
* MS_LibControl
*/
typedef struct {
BYTE reserved;
BYTE intr;
BYTE status0;
BYTE status1;
BYTE ovrflg;
BYTE mngflg;
WORD logadr;
} MS_LibTypeExtdat;
typedef struct {
DWORD flags;
DWORD BytesPerSector;
DWORD NumberOfCylinder;
DWORD SectorsPerCylinder;
WORD cardType; /* R/W, RO, Hybrid */
WORD blockSize;
WORD PagesPerBlock;
WORD NumberOfPhyBlock;
WORD NumberOfLogBlock;
WORD NumberOfSegment;
WORD *Phy2LogMap; /* phy2log table */
WORD *Log2PhyMap; /* log2phy table */
WORD wrtblk;
BYTE pagemap[(MS_MAX_PAGES_PER_BLOCK + (MS_LIB_BITS_PER_BYTE-1)) /
MS_LIB_BITS_PER_BYTE];
BYTE *blkpag;
MS_LibTypeExtdat *blkext;
BYTE copybuf[512];
} MS_LibControl;
#endif
drivers/staging/keucr/msscsi.c 已删除 100644 → 0
浏览文件 @ 33842ced
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <scsi/scsi.h>
#include <scsi/scsi_eh.h>
#include <scsi/scsi_device.h>
#include "usb.h"
#include "scsiglue.h"
#include "transport.h"
/*
* 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 {
ENE_MSInit(us);
return USB_STOR_TRANSPORT_GOOD;
}
return USB_STOR_TRANSPORT_GOOD;
}
/*
* 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};
usb_stor_set_xfer_buf(us, data_ptr, 36, srb, TO_XFER_BUF);
return USB_STOR_TRANSPORT_GOOD;
}
/*
* 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};
if (us->MS_Status.WtP)
usb_stor_set_xfer_buf(us, mediaWP, 12, srb, TO_XFER_BUF);
else
usb_stor_set_xfer_buf(us, mediaNoWP, 12, srb, TO_XFER_BUF);
return USB_STOR_TRANSPORT_GOOD;
}
/*
* MS_SCSI_Read_Capacity()
*/
int MS_SCSI_Read_Capacity(struct us_data *us, struct scsi_cmnd *srb)
{
unsigned int offset = 0;
struct scatterlist *sg = NULL;
DWORD bl_num;
WORD bl_len;
BYTE buf[8];
pr_info("MS_SCSI_Read_Capacity\n");
bl_len = 0x200;
if (us->MS_Status.IsMSPro)
bl_num = us->MSP_TotalBlock - 1;
else
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; */
buf[0] = (bl_num >> 24) & 0xff;
buf[1] = (bl_num >> 16) & 0xff;
buf[2] = (bl_num >> 8) & 0xff;
buf[3] = (bl_num >> 0) & 0xff;
buf[4] = (bl_len >> 24) & 0xff;
buf[5] = (bl_len >> 16) & 0xff;
buf[6] = (bl_len >> 8) & 0xff;
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); */
return USB_STOR_TRANSPORT_GOOD;
}
/*
* 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);
WORD blen = ((Cdb[7] << 8) & 0xff00) | ((Cdb[8] << 0) & 0x00ff);
DWORD blenByte = blen * 0x200;
/* pr_info("SCSIOP_READ --- bn = %X, blen = %X, srb->use_sg = %X\n",
bn, blen, srb->use_sg); */
if (bn > us->bl_num)
return USB_STOR_TRANSPORT_ERROR;
if (us->MS_Status.IsMSPro) {
result = ENE_LoadBinCode(us, MSP_RW_PATTERN);
if (result != USB_STOR_XFER_GOOD) {
pr_info("Load MSP RW pattern Fail !!\n");
return USB_STOR_TRANSPORT_ERROR;
}
/* 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;
bcb->Flags = 0x80;
bcb->CDB[0] = 0xF1;
bcb->CDB[1] = 0x02;
bcb->CDB[5] = (BYTE)(bn);
bcb->CDB[4] = (BYTE)(bn>>8);
bcb->CDB[3] = (BYTE)(bn>>16);
bcb->CDB[2] = (BYTE)(bn>>24);
result = ENE_SendScsiCmd(us, FDIR_READ, scsi_sglist(srb), 1);
} else {
void *buf;
int offset = 0;
WORD phyblk, logblk;
BYTE PageNum;
WORD len;
DWORD blkno;
buf = kmalloc(blenByte, GFP_KERNEL);
if (buf == NULL)
return USB_STOR_TRANSPORT_ERROR;
result = ENE_LoadBinCode(us, MS_RW_PATTERN);
if (result != USB_STOR_XFER_GOOD) {
pr_info("Load MS RW pattern Fail !!\n");
result = USB_STOR_TRANSPORT_ERROR;
goto exit;
}
logblk = (WORD)(bn / us->MS_Lib.PagesPerBlock);
PageNum = (BYTE)(bn % us->MS_Lib.PagesPerBlock);
while (1) {
if (blen > (us->MS_Lib.PagesPerBlock-PageNum))
len = us->MS_Lib.PagesPerBlock-PageNum;
else
len = blen;
phyblk = MS_LibConv2Physical(us, logblk);
blkno = phyblk * 0x20 + PageNum;
/* 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;
bcb->Flags = 0x80;
bcb->CDB[0] = 0xF1;
bcb->CDB[1] = 0x02;
bcb->CDB[5] = (BYTE)(blkno);
bcb->CDB[4] = (BYTE)(blkno>>8);
bcb->CDB[3] = (BYTE)(blkno>>16);
bcb->CDB[2] = (BYTE)(blkno>>24);
result = ENE_SendScsiCmd(us, FDIR_READ, buf+offset, 0);
if (result != USB_STOR_XFER_GOOD) {
pr_info("MS_SCSI_Read --- result = %x\n",
result);
result = USB_STOR_TRANSPORT_ERROR;
goto exit;
}
blen -= len;
if (blen <= 0)
break;
logblk++;
PageNum = 0;
offset += MS_BYTES_PER_PAGE*len;
}
usb_stor_set_xfer_buf(us, buf, blenByte, srb, TO_XFER_BUF);
exit:
kfree(buf);
}
return result;
}
/*
* 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);
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) {
result = ENE_LoadBinCode(us, MSP_RW_PATTERN);
if (result != USB_STOR_XFER_GOOD) {
pr_info("Load MSP RW pattern Fail !!\n");
return USB_STOR_TRANSPORT_ERROR;
}
/* 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;
bcb->Flags = 0x00;
bcb->CDB[0] = 0xF0;
bcb->CDB[1] = 0x04;
bcb->CDB[5] = (BYTE)(bn);
bcb->CDB[4] = (BYTE)(bn>>8);
bcb->CDB[3] = (BYTE)(bn>>16);
bcb->CDB[2] = (BYTE)(bn>>24);
result = ENE_SendScsiCmd(us, FDIR_WRITE, scsi_sglist(srb), 1);
} else {
void *buf;
int offset = 0;
WORD PhyBlockAddr;
BYTE PageNum;
DWORD result;
WORD len, oldphy, newphy;
buf = kmalloc(blenByte, GFP_KERNEL);
if (buf == NULL)
return USB_STOR_TRANSPORT_ERROR;
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) {
pr_info("Load MS RW pattern Fail !!\n");
result = USB_STOR_TRANSPORT_ERROR;
goto exit;
}
PhyBlockAddr = (WORD)(bn / us->MS_Lib.PagesPerBlock);
PageNum = (BYTE)(bn % us->MS_Lib.PagesPerBlock);
while (1) {
if (blen > (us->MS_Lib.PagesPerBlock-PageNum))
len = us->MS_Lib.PagesPerBlock-PageNum;
else
len = blen;
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) {
pr_info("MS_SCSI_Write --- result = %x\n",
result);
result = USB_STOR_TRANSPORT_ERROR;
goto exit;
}
us->MS_Lib.Phy2LogMap[oldphy] = MS_LB_NOT_USED_ERASED;
MS_LibForceSetLogicalPair(us, PhyBlockAddr, newphy);
blen -= len;
if (blen <= 0)
break;
PhyBlockAddr++;
PageNum = 0;
offset += MS_BYTES_PER_PAGE*len;
}
exit:
kfree(buf);
}
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;
}
drivers/staging/keucr/transport.c
浏览文件 @ 20c3d7f7
......@@ -432,7 +432,7 @@ void ENE_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
usb_stor_print_cmd(srb);
/* send the command to the transport layer */
scsi_set_resid(srb, 0);
if (!(us->MS_Status.Ready || us->SM_Status.Ready))
if (!(us->SM_Status.Ready))
result = ENE_InitMedia(us);
if (us->Power_IsResum == true) {
......@@ -440,8 +440,6 @@ void ENE_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
us->Power_IsResum = false;
}
if (us->MS_Status.Ready)
result = MS_SCSIIrp(us, srb);
if (us->SM_Status.Ready)
result = SM_SCSIIrp(us, srb);
......
drivers/staging/keucr/transport.h
浏览文件 @ 20c3d7f7
......@@ -95,7 +95,6 @@ extern void usb_stor_set_xfer_buf(struct us_data*, unsigned char *buffer,
*/
extern void ENE_stor_invoke_transport(struct scsi_cmnd *, struct us_data *);
extern int ENE_InitMedia(struct us_data *);
extern int ENE_MSInit(struct us_data *);
extern int ENE_SMInit(struct us_data *);
extern int ENE_SendScsiCmd(struct us_data*, BYTE, void*, int);
extern int ENE_LoadBinCode(struct us_data*, BYTE);
......@@ -107,51 +106,6 @@ extern void BuildSenseBuffer(struct scsi_cmnd *, int);
/*
* ENE scsi function
*/
extern int MS_SCSIIrp(struct us_data *us, struct scsi_cmnd *srb);
extern int SM_SCSIIrp(struct us_data *us, struct scsi_cmnd *srb);
/*
* ENE MS function
*/
extern int MS_CardInit(struct us_data *us);
extern void MS_LibFreeAllocatedArea(struct us_data *us);
extern void MS_LibFreeWriteBuf(struct us_data *us);
extern int MS_LibFreeLogicalMap(struct us_data *us);
extern int MS_LibForceSetLogicalPair(struct us_data *us, WORD logblk,
WORD phyblk);
extern int MS_ReaderReadPage(struct us_data *us, DWORD PhyBlockAddr,
BYTE PageNum, DWORD *PageBuf,
MS_LibTypeExtdat *ExtraDat);
extern int MS_ReaderCopyBlock(struct us_data *us, WORD oldphy,
WORD newphy, WORD PhyBlockAddr,
BYTE PageNum, PBYTE buf, WORD len);
extern int MS_ReaderEraseBlock(struct us_data *us, DWORD PhyBlockAddr);
extern int MS_LibProcessBootBlock(struct us_data *us, WORD PhyBlock,
BYTE *PageData);
extern int MS_LibAllocLogicalMap(struct us_data *us);
extern int MS_LibSetBootBlockMark(struct us_data *us, WORD phyblk);
extern int MS_LibSetLogicalBlockMark(struct us_data *us, WORD phyblk,
WORD mark);
extern int MS_LibSetInitialErrorBlock(struct us_data *us, WORD phyblk);
extern int MS_LibScanLogicalBlockNumber(struct us_data *us, WORD phyblk);
extern int MS_LibAllocWriteBuf(struct us_data *us);
void MS_LibClearWriteBuf(struct us_data *us);
void MS_LibPhy2LogRange(WORD PhyBlock, WORD *LogStart,
WORD *LogEnde);
extern int MS_LibReadExtra(struct us_data *us, DWORD PhyBlock,
BYTE PageNum, MS_LibTypeExtdat *ExtraDat);
extern int MS_LibReadExtraBlock(struct us_data *us, DWORD PhyBlock,
BYTE PageNum, BYTE blen, void *buf);
extern int MS_LibSetAcquiredErrorBlock(struct us_data *us, WORD phyblk);
extern int MS_LibErasePhyBlock(struct us_data *us, WORD phyblk);
extern int MS_LibErrorPhyBlock(struct us_data *us, WORD phyblk);
extern int MS_LibOverwriteExtra(struct us_data *us, DWORD PhyBlockAddr,
BYTE PageNum, BYTE OverwriteFlag);
extern int MS_LibSetLogicalPair(struct us_data *us,
WORD logblk, WORD phyblk);
extern int MS_LibCheckDisableBlock(struct us_data *us, WORD PhyBlock);
extern int MS_CountFreeBlock(struct us_data *us, WORD PhyBlock);
extern int MS_LibSearchBlockFromLogical(struct us_data *us, WORD logblk);
extern int MS_LibSearchBlockFromPhysical(struct us_data *us, WORD phyblk);
#endif
drivers/staging/keucr/usb.c
浏览文件 @ 20c3d7f7
......@@ -75,7 +75,6 @@ static int eucr_resume(struct usb_interface *iface)
us->Power_IsResum = true;
//
//us->SD_Status.Ready = 0; //??
us->MS_Status = *(PMS_STATUS)&tmp;
us->SM_Status = *(PSM_STATUS)&tmp;
return 0;
......@@ -98,7 +97,6 @@ static int eucr_reset_resume(struct usb_interface *iface)
us->Power_IsResum = true;
//
//us->SD_Status.Ready = 0; //??
us->MS_Status = *(PMS_STATUS)&tmp;
us->SM_Status = *(PSM_STATUS)&tmp;
return 0;
}
......
drivers/staging/keucr/usb.h
浏览文件 @ 20c3d7f7
......@@ -10,7 +10,6 @@
#include <linux/mutex.h>
#include <scsi/scsi_host.h>
#include "common.h"
#include "ms.h"
struct us_data;
struct scsi_cmnd;
......@@ -201,7 +200,7 @@ struct us_data {
//----- MS Control Data ----------------
BOOLEAN MS_SWWP;
DWORD MSP_TotalBlock;
MS_LibControl MS_Lib;
/* MS_LibControl MS_Lib; */
BOOLEAN MS_IsRWPage;
WORD MS_Model;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或