26c26
< * $FreeBSD: head/sys/dev/hptmv/mvSata.h 149871 2005-09-07 23:33:26Z scottl $
---
> * $FreeBSD: head/sys/dev/hptmv/mvSata.h 190809 2009-04-07 16:38:25Z delphij $
39c39,44
< #if SUPPORT_MV_SATA_GEN_1==1 && SUPPORT_MV_SATA_GEN_2==1
---
> #ifndef SUPPORT_MV_SATA_GEN_2E
> #define SUPPORT_MV_SATA_GEN_2E 0
> #endif
>
> #if (SUPPORT_MV_SATA_GEN_1 + SUPPORT_MV_SATA_GEN_2 + SUPPORT_MV_SATA_GEN_2E) > 1
>
41c46,48
< #define MV_SATA_GEN_2(x) ((x)->sataAdapterGeneration==2)
---
> #define MV_SATA_GEN_2(x) ((x)->sataAdapterGeneration>=2)
> #define MV_SATA_GEN_2E(x) ((x)->sataAdapterGeneration==3)
>
42a50
>
44a53,54
> #define MV_SATA_GEN_2E(x) 0
>
45a56
>
47a59,66
> #define MV_SATA_GEN_2E(x) 0
>
> #elif SUPPORT_MV_SATA_GEN_2E==1
>
> #define MV_SATA_GEN_1(x) 0
> #define MV_SATA_GEN_2(x) 1 /* gen2E impiles gen2 */
> #define MV_SATA_GEN_2E(x) 1
>
58a78,82
>
> #if defined(RR2310) || defined(RR1740) || defined(RR2210) || defined (RR2522)
> #define MV_SATA_CHANNELS_NUM 4
> #define MV_SATA_UNITS_NUM 1
> #else
60a85,86
> #endif
>
159c185
< struct mvStorageDevRegisters FAR*);
---
> struct mvStorageDevRegisters SS_SEG*);
225,226c251,252
< struct mvDmaRequestQueueEntry FAR *requestQueue;
< struct mvDmaResponseQueueEntry FAR *responseQueue;
---
> struct mvDmaRequestQueueEntry SS_SEG *requestQueue;
> struct mvDmaResponseQueueEntry SS_SEG *responseQueue;
246c272
< MV_U32 freeIDsStack[MV_EDMA_QUEUE_LENGTH];
---
> MV_U32 freeIDsStack[CHANNEL_QUEUE_LENGTH];
281a308,309
> MV_BOOLEAN implement7042A0Workarounds;
> MV_BOOLEAN implement7042A1Workarounds;
282a311
> MV_BOOLEAN isPEX;
397,408d425
< /* Execute UDMA ATA commands */
< MV_EDMA_QUEUE_RESULT HPTLIBAPI mvSataQueueUDmaCommand(MV_SATA_ADAPTER *pAdapter,
< MV_U8 channelIndex,
< MV_UDMA_TYPE readWrite,
< MV_U32 lowLBAAddr,
< MV_U16 highLBAAddr,
< MV_U16 sectorCount,
< MV_U32 prdLowAddr,
< MV_U32 prdHighAddr,
< mvSataCommandCompletionCallBack_t callBack,
< MV_VOID_PTR commandId);
<
411c428
< MV_QUEUE_COMMAND_INFO FAR *pCommandParams);
---
> MV_QUEUE_COMMAND_INFO SS_SEG *pCommandParams);