Re: RFC: ATA to CAM integration patch

Goran Lowkrantz wrote:
> Clean CURRENT as of this morning, patches:
> /usr/src/sys/modules/ahci/../../dev/ahci/ahci.c:1032: error: 
> 'AHCI_DMA_ENTRIES' undeclared (first use in this function)
> /usr/src/sys/modules/ahci/../../dev/ahci/ahci.c:1032: error: (Each 
> undeclared identifier is reported only once
> /usr/src/sys/modules/ahci/../../dev/ahci/ahci.c:1032: error: for each 
> function it appears in.)
> *** Error code 1
Examining ahci.c, ahci.h, and ata-all.h: appears that AHCI_DMA_ENTRIES 
is superceded by AHCI_SG_ENTRIES judging by the name of the struct{} and 
the #define inside it.

In ata-all.h:
struct ata_ahci_cmd_tab {
    u_int8_t                    cfis[64];
    u_int8_t                    acmd[32];
    u_int8_t                    reserved[32];
#define ATA_AHCI_DMA_ENTRIES            64
    struct ata_ahci_dma_prd     prd_tab[ATA_AHCI_DMA_ENTRIES];
} __packed;

In ahci.h:

struct ahci_cmd_tab {
    u_int8_t                    cfis[64];
    u_int8_t                    acmd[32];
    u_int8_t                    reserved[32];
    struct ahci_dma_prd         prd_tab[AHCI_SG_ENTRIES];
} __packed;

And AHCI_SG_ENTRIES is defined as
#define AHCI_SG_ENTRIES (roundup(btoc(MAXPHYS) + 1, 8))

Kernel builds fine for me after "sed 
's/AHCI_DMA_ENTRIES/AHCI_SG_ENTRIES/' /usr/src/sys/dev/ahci/ahci.c" 
(only one occurrence of that macro, aside from the .h file, anyway).

--
Kamigishi Rei
KREI-RIPE