Commit 66cbd3ab authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: brcm80211: s/uint32/u32/ 



Use the kernel types, don't invent your own.

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 370adc7c

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+22 −22
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ const uint bcmsdh_msglevel = BCMSDH_ERROR_VAL; 
struct bcmsdh_info {

	bool init_success;	/* underlying driver successfully attached */

	void *sdioh;		/* handler for sdioh */

	uint32 vendevid;	/* Target Vendor and Device ID on SD bus */

	u32 vendevid;	/* Target Vendor and Device ID on SD bus */

	osl_t *osh;

	bool regfail;		/* Save status of last

				 reg_read/reg_write call */

	uint32 sbwad;		/* Save backplane window address */

	u32 sbwad;		/* Save backplane window address */

};

/* local copy of bcm sd handler */

bcmsdh_info_t *l_bcmsdh;
@@ -78,7 +78,7 @@ bcmsdh_info_t *bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva, uint irq) 
	bcmsdh->osh = osh;

	bcmsdh->init_success = TRUE;



	*regsva = (uint32 *) SI_ENUM_BASE;

	*regsva = (u32 *) SI_ENUM_BASE;



	/* Report the BAR, to fix if needed */

	bcmsdh->sbwad = SI_ENUM_BASE;
@@ -181,7 +181,7 @@ int bcmsdh_devremove_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh) 
	return BCME_UNSUPPORTED;

}



u8 bcmsdh_cfg_read(void *sdh, uint fnc_num, uint32 addr, int *err)

u8 bcmsdh_cfg_read(void *sdh, uint fnc_num, u32 addr, int *err)

{

	bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;

	SDIOH_API_RC status;
@@ -217,7 +217,7 @@ u8 bcmsdh_cfg_read(void *sdh, uint fnc_num, uint32 addr, int *err) 
}



void

bcmsdh_cfg_write(void *sdh, uint fnc_num, uint32 addr, u8 data, int *err)

bcmsdh_cfg_write(void *sdh, uint fnc_num, u32 addr, u8 data, int *err)

{

	bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;

	SDIOH_API_RC status;
@@ -249,11 +249,11 @@ bcmsdh_cfg_write(void *sdh, uint fnc_num, uint32 addr, u8 data, int *err) 
		     __func__, fnc_num, addr, data));

}



uint32 bcmsdh_cfg_read_word(void *sdh, uint fnc_num, uint32 addr, int *err)

u32 bcmsdh_cfg_read_word(void *sdh, uint fnc_num, u32 addr, int *err)

{

	bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;

	SDIOH_API_RC status;

	uint32 data = 0;

	u32 data = 0;



	if (!bcmsdh)

		bcmsdh = l_bcmsdh;
@@ -267,14 +267,14 @@ uint32 bcmsdh_cfg_read_word(void *sdh, uint fnc_num, uint32 addr, int *err) 
	if (err)

		*err = (SDIOH_API_SUCCESS(status) ? 0 : BCME_SDIO_ERROR);



	BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, uint32data = 0x%x\n",

	BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u32data = 0x%x\n",

		     __func__, fnc_num, addr, data));



	return data;

}



void

bcmsdh_cfg_write_word(void *sdh, uint fnc_num, uint32 addr, uint32 data,

bcmsdh_cfg_write_word(void *sdh, uint fnc_num, u32 addr, u32 data,

		      int *err)

{

	bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
@@ -292,7 +292,7 @@ bcmsdh_cfg_write_word(void *sdh, uint fnc_num, uint32 addr, uint32 data, 
	if (err)

		*err = (SDIOH_API_SUCCESS(status) ? 0 : BCME_SDIO_ERROR);



	BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, uint32data = 0x%x\n",

	BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u32data = 0x%x\n",

		     __func__, fnc_num, addr, data));

}
@@ -336,7 +336,7 @@ int bcmsdh_cis_read(void *sdh, uint func, u8 * cis, uint length) 
	return SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR;

}



static int bcmsdhsdio_set_sbaddr_window(void *sdh, uint32 address)

static int bcmsdhsdio_set_sbaddr_window(void *sdh, u32 address)

{

	int err = 0;

	bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
@@ -353,11 +353,11 @@ static int bcmsdhsdio_set_sbaddr_window(void *sdh, uint32 address) 
	return err;

}



uint32 bcmsdh_reg_read(void *sdh, uint32 addr, uint size)

u32 bcmsdh_reg_read(void *sdh, u32 addr, uint size)

{

	bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;

	SDIOH_API_RC status;

	uint32 word = 0;

	u32 word = 0;

	uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;



	BCMSDH_INFO(("%s:fun = 1, addr = 0x%x, ", __func__, addr));
@@ -383,7 +383,7 @@ uint32 bcmsdh_reg_read(void *sdh, uint32 addr, uint size) 


	bcmsdh->regfail = !(SDIOH_API_SUCCESS(status));



	BCMSDH_INFO(("uint32data = 0x%x\n", word));

	BCMSDH_INFO(("u32data = 0x%x\n", word));



	/* if ok, return appropriately masked word */

	if (SDIOH_API_SUCCESS(status)) {
@@ -392,7 +392,7 @@ uint32 bcmsdh_reg_read(void *sdh, uint32 addr, uint size) 
			return word & 0xff;

		case sizeof(u16):

			return word & 0xffff;

		case sizeof(uint32):

		case sizeof(u32):

			return word;

		default:

			bcmsdh->regfail = TRUE;
@@ -406,7 +406,7 @@ uint32 bcmsdh_reg_read(void *sdh, uint32 addr, uint size) 
	return 0xFFFFFFFF;

}



uint32 bcmsdh_reg_write(void *sdh, uint32 addr, uint size, uint32 data)

u32 bcmsdh_reg_write(void *sdh, u32 addr, uint size, u32 data)

{

	bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;

	SDIOH_API_RC status;
@@ -451,7 +451,7 @@ bool bcmsdh_regfail(void *sdh) 
}



int

bcmsdh_recv_buf(void *sdh, uint32 addr, uint fn, uint flags,

bcmsdh_recv_buf(void *sdh, u32 addr, uint fn, uint flags,

		u8 *buf, uint nbytes, void *pkt,

		bcmsdh_cmplt_fn_t complete, void *handle)

{
@@ -496,7 +496,7 @@ bcmsdh_recv_buf(void *sdh, uint32 addr, uint fn, uint flags, 
}



int

bcmsdh_send_buf(void *sdh, uint32 addr, uint fn, uint flags,

bcmsdh_send_buf(void *sdh, u32 addr, uint fn, uint flags,

		u8 *buf, uint nbytes, void *pkt,

		bcmsdh_cmplt_fn_t complete, void *handle)

{
@@ -540,7 +540,7 @@ bcmsdh_send_buf(void *sdh, uint32 addr, uint fn, uint flags, 
	return SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR;

}



int bcmsdh_rwdata(void *sdh, uint rw, uint32 addr, u8 *buf, uint nbytes)

int bcmsdh_rwdata(void *sdh, uint rw, u32 addr, u8 *buf, uint nbytes)

{

	bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;

	SDIOH_API_RC status;
@@ -612,12 +612,12 @@ void *bcmsdh_get_sdioh(bcmsdh_info_t *sdh) 
}



/* Function to pass device-status bits to DHD. */

uint32 bcmsdh_get_dstatus(void *sdh)

u32 bcmsdh_get_dstatus(void *sdh)

{

	return 0;

}



uint32 bcmsdh_cur_sbwad(void *sdh)

u32 bcmsdh_cur_sbwad(void *sdh)

{

	bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
@@ -627,7 +627,7 @@ uint32 bcmsdh_cur_sbwad(void *sdh) 
	return bcmsdh->sbwad;

}



void bcmsdh_chipinfo(void *sdh, uint32 chip, uint32 chiprev)

void bcmsdh_chipinfo(void *sdh, u32 chip, u32 chiprev)

{

	return;

}

drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ int bcmsdh_probe(struct device *dev) 
	struct resource *r;

#endif				/* BCMLXSDMMC */

	int irq = 0;

	uint32 vendevid;

	u32 vendevid;

	unsigned long irq_flags = 0;



#if !defined(BCMLXSDMMC) && defined(BCMPLATFORM_BUS)
@@ -384,7 +384,7 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if ((pdev->vendor == VENDOR_TI)

	    && ((pdev->device == PCIXX21_FLASHMEDIA_ID)

		|| (pdev->device == PCIXX21_FLASHMEDIA0_ID))) {

		uint32 config_reg;

		u32 config_reg;



		SDLX_MSG(("%s: Disabling TI FlashMedia Controller.\n",

			  __func__));

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+27 −27
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ extern void sdio_function_cleanup(void); 
static void IRQHandler(struct sdio_func *func);

static void IRQHandlerF2(struct sdio_func *func);

#endif				/* !defined(OOB_INTR_ONLY) */

static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, uint32 regaddr);

static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, u32 regaddr);

extern int sdio_reset_comm(struct mmc_card *card);



extern PBCMSDH_SDMMC_INSTANCE gInstance;
@@ -66,13 +66,13 @@ DHD_PM_RESUME_WAIT_INIT(sdioh_request_buffer_wait); 


#define DMA_ALIGN_MASK	0x03



int sdioh_sdmmc_card_regread(sdioh_info_t *sd, int func, uint32 regaddr,

			     int regsize, uint32 *data);

int sdioh_sdmmc_card_regread(sdioh_info_t *sd, int func, u32 regaddr,

			     int regsize, u32 *data);



static int sdioh_sdmmc_card_enablefuncs(sdioh_info_t *sd)

{

	int err_ret;

	uint32 fbraddr;

	u32 fbraddr;

	u8 func;



	sd_trace(("%s\n", __func__));
@@ -406,7 +406,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, 
	int val_size;

	int32 int_val = 0;

	bool bool_val;

	uint32 actionid;

	u32 actionid;



	ASSERT(name);

	ASSERT(len >= 0);
@@ -468,7 +468,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, 
		break;



	case IOV_GVAL(IOV_BLOCKSIZE):

		if ((uint32) int_val > si->num_funcs) {

		if ((u32) int_val > si->num_funcs) {

			bcmerror = BCME_BADARG;

			break;

		}
@@ -478,7 +478,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, 


	case IOV_SVAL(IOV_BLOCKSIZE):

		{

			uint func = ((uint32) int_val >> 16);

			uint func = ((u32) int_val >> 16);

			uint blksize = (u16) int_val;

			uint maxsize;
@@ -542,7 +542,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, 
		break;



	case IOV_GVAL(IOV_DIVISOR):

		int_val = (uint32) sd_divisor;

		int_val = (u32) sd_divisor;

		bcopy(&int_val, arg, val_size);

		break;
@@ -551,7 +551,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, 
		break;



	case IOV_GVAL(IOV_POWER):

		int_val = (uint32) sd_power;

		int_val = (u32) sd_power;

		bcopy(&int_val, arg, val_size);

		break;
@@ -560,7 +560,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, 
		break;



	case IOV_GVAL(IOV_CLOCK):

		int_val = (uint32) sd_clock;

		int_val = (u32) sd_clock;

		bcopy(&int_val, arg, val_size);

		break;
@@ -569,7 +569,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, 
		break;



	case IOV_GVAL(IOV_SDMODE):

		int_val = (uint32) sd_sdmode;

		int_val = (u32) sd_sdmode;

		bcopy(&int_val, arg, val_size);

		break;
@@ -578,7 +578,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, 
		break;



	case IOV_GVAL(IOV_HISPEED):

		int_val = (uint32) sd_hiok;

		int_val = (u32) sd_hiok;

		bcopy(&int_val, arg, val_size);

		break;
@@ -703,7 +703,7 @@ SDIOH_API_RC sdioh_enable_hw_oob_intr(sdioh_info_t *sd, bool enable) 
#endif				/* defined(OOB_INTR_ONLY) && defined(HW_OOB) */



extern SDIOH_API_RC

sdioh_cfg_read(sdioh_info_t *sd, uint fnc_num, uint32 addr, u8 *data)

sdioh_cfg_read(sdioh_info_t *sd, uint fnc_num, u32 addr, u8 *data)

{

	SDIOH_API_RC status;

	/* No lock needed since sdioh_request_byte does locking */
@@ -712,7 +712,7 @@ sdioh_cfg_read(sdioh_info_t *sd, uint fnc_num, uint32 addr, u8 *data) 
}



extern SDIOH_API_RC

sdioh_cfg_write(sdioh_info_t *sd, uint fnc_num, uint32 addr, u8 *data)

sdioh_cfg_write(sdioh_info_t *sd, uint fnc_num, u32 addr, u8 *data)

{

	/* No lock needed since sdioh_request_byte does locking */

	SDIOH_API_RC status;
@@ -720,11 +720,11 @@ sdioh_cfg_write(sdioh_info_t *sd, uint fnc_num, uint32 addr, u8 *data) 
	return status;

}



static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, uint32 regaddr)

static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, u32 regaddr)

{

	/* read 24 bits and return valid 17 bit addr */

	int i;

	uint32 scratch, regdata;

	u32 scratch, regdata;

	u8 *ptr = (u8 *)&scratch;

	for (i = 0; i < 3; i++) {

		if ((sdioh_sdmmc_card_regread(sd, 0, regaddr, 1, &regdata)) !=
@@ -742,11 +742,11 @@ static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, uint32 regaddr) 
}



extern SDIOH_API_RC

sdioh_cis_read(sdioh_info_t *sd, uint func, u8 *cisd, uint32 length)

sdioh_cis_read(sdioh_info_t *sd, uint func, u8 *cisd, u32 length)

{

	uint32 count;

	u32 count;

	int offset;

	uint32 foo;

	u32 foo;

	u8 *cis = cisd;



	sd_trace(("%s: Func = %d\n", __func__, func));
@@ -876,7 +876,7 @@ sdioh_request_byte(sdioh_info_t *sd, uint rw, uint func, uint regaddr, 


extern SDIOH_API_RC

sdioh_request_word(sdioh_info_t *sd, uint cmd_type, uint rw, uint func,

		   uint addr, uint32 *word, uint nbytes)

		   uint addr, u32 *word, uint nbytes)

{

	int err_ret = SDIOH_API_RC_FAIL;
@@ -932,7 +932,7 @@ sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func, 
		     uint addr, void *pkt)

{

	bool fifo = (fix_inc == SDIOH_DATA_FIX);

	uint32 SGCount = 0;

	u32 SGCount = 0;

	int err_ret = 0;



	void *pnext;
@@ -963,7 +963,7 @@ sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func, 
		 * is supposed to give

		 * us something we can work with.

		 */

		ASSERT(((uint32) (PKTDATA(pkt)) & DMA_ALIGN_MASK) == 0);

		ASSERT(((u32) (PKTDATA(pkt)) & DMA_ALIGN_MASK) == 0);



		if ((write) && (!fifo)) {

			err_ret = sdio_memcpy_toio(gInstance->func[func], addr,
@@ -1067,7 +1067,7 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write, 
#else

		PKTFREE(sd->osh, mypkt, write ? TRUE : FALSE);

#endif				/* DHD_USE_STATIC_BUF */

	} else if (((uint32) (PKTDATA(pkt)) & DMA_ALIGN_MASK) != 0) {

	} else if (((u32) (PKTDATA(pkt)) & DMA_ALIGN_MASK) != 0) {

		/* Case 2: We have a packet, but it is unaligned. */



		/* In this case, we cannot have a chain. */
@@ -1156,8 +1156,8 @@ void sdioh_sdmmc_devintr_on(sdioh_info_t *sd) 


/* Read client card reg */

int

sdioh_sdmmc_card_regread(sdioh_info_t *sd, int func, uint32 regaddr,

			 int regsize, uint32 *data)

sdioh_sdmmc_card_regread(sdioh_info_t *sd, int func, u32 regaddr,

			 int regsize, u32 *data)

{



	if ((func == 0) || (regsize == 1)) {
@@ -1222,8 +1222,8 @@ static void IRQHandlerF2(struct sdio_func *func) 
#ifdef NOTUSED

/* Write client card reg */

static int

sdioh_sdmmc_card_regwrite(sdioh_info_t *sd, int func, uint32 regaddr,

			  int regsize, uint32 data)

sdioh_sdmmc_card_regwrite(sdioh_info_t *sd, int func, u32 regaddr,

			  int regsize, u32 data)

{



	if ((func == 0) || (regsize == 1)) {

drivers/staging/brcm80211/brcmfmac/bcmutils.c

+10 −10
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ u16 hndcrc16(u8 *pdata, /* pointer to array of data to process */ 
	return crc;

}



static const uint32 crc32_table[256] = {

static const u32 crc32_table[256] = {

	0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,

	0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,

	0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
@@ -1237,9 +1237,9 @@ static const uint32 crc32_table[256] = { 
	0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D

};



uint32 hndcrc32(u8 *pdata,	/* pointer to array of data to process */

u32 hndcrc32(u8 *pdata,	/* pointer to array of data to process */

		uint nbytes,	/* number of input data bytes to process */

		uint32 crc	/* either CRC32_INIT_VALUE or previous

		u32 crc	/* either CRC32_INIT_VALUE or previous

					 return value */

)

{
@@ -1288,8 +1288,8 @@ void testcrc32(void) 
	uint j, k, l;

	u8 *buf;

	uint len[CNBUFS];

	uint32 crcr;

	uint32 crc32tv[CNBUFS] = {

	u32 crcr;

	u32 crc32tv[CNBUFS] = {

		0xd2cb1faa, 0xd385c8fa, 0xf5b4f3f3, 0x55789e20, 0x00343110};



	ASSERT((buf = MALLOC(CBUFSIZ * CNBUFS)) != NULL);
@@ -1408,13 +1408,13 @@ bcm_tlv_t *bcm_parse_ordered_tlvs(void *buf, int buflen, uint key) 
#if defined(WLMSG_PRHDRS) || defined(WLMSG_PRPKT) || defined(WLMSG_ASSOC) || \

	defined(DHD_DEBUG)

int

bcm_format_flags(const bcm_bit_desc_t *bd, uint32 flags, char *buf, int len)

bcm_format_flags(const bcm_bit_desc_t *bd, u32 flags, char *buf, int len)

{

	int i;

	char *p = buf;

	char hexstr[16];

	int slen = 0;

	uint32 bit;

	u32 bit;

	const char *name;



	if (len < 2 || !buf)
@@ -1500,7 +1500,7 @@ void prhex(const char *msg, unsigned char *buf, uint nbytes) 
#endif		/* defined(WLMSG_PRHDRS) || defined(WLMSG_PRPKT) */



/* Produce a human-readable string for boardrev */

char *bcm_brev_str(uint32 brev, char *buf)

char *bcm_brev_str(u32 brev, char *buf)

{

	if (brev < 0x100)

		snprintf(buf, 8, "%d.%d", (brev & 0xf0) >> 4, brev & 0xf);
@@ -1540,7 +1540,7 @@ void printbig(char *buf) 
/* routine to dump fields in a fileddesc structure */

uint

bcmdumpfields(bcmutl_rdreg_rtn read_rtn, void *arg0, uint arg1,

	      struct fielddesc *fielddesc_array, char *buf, uint32 bufsize)

	      struct fielddesc *fielddesc_array, char *buf, u32 bufsize)

{

	uint filled_len;

	int len;
@@ -1555,7 +1555,7 @@ bcmdumpfields(bcmutl_rdreg_rtn read_rtn, void *arg0, uint arg1, 
		len = snprintf(buf, bufsize, cur_ptr->nameandfmt,

			       read_rtn(arg0, arg1, cur_ptr->offset));

		/* check for snprintf overflow or error */

		if (len < 0 || (uint32) len >= bufsize)

		if (len < 0 || (u32) len >= bufsize)

			len = bufsize - 1;

		buf += len;

		bufsize -= len;

drivers/staging/brcm80211/brcmfmac/dhd.h

+5 −5
Original line number Diff line number Diff line
@@ -359,10 +359,10 @@ extern void dhd_os_sdtxunlock(dhd_pub_t *pub); 
int setScheduler(struct task_struct *p, int policy, struct sched_param *param);



typedef struct {

	uint32 limit;		/* Expiration time (usec) */

	uint32 increment;	/* Current expiration increment (usec) */

	uint32 elapsed;		/* Current elapsed time (usec) */

	uint32 tick;		/* O/S tick time (usec) */

	u32 limit;		/* Expiration time (usec) */

	u32 increment;	/* Current expiration increment (usec) */

	u32 elapsed;		/* Current elapsed time (usec) */

	u32 tick;		/* O/S tick time (usec) */

} dhd_timeout_t;



extern void dhd_timeout_start(dhd_timeout_t *tmo, uint usec);
@@ -377,7 +377,7 @@ extern void wl_event_to_host_order(wl_event_msg_t *evt); 
extern void dhd_common_init(void);



extern int dhd_add_if(struct dhd_info *dhd, int ifidx, void *handle,

		      char *name, u8 *mac_addr, uint32 flags, u8 bssidx);

		      char *name, u8 *mac_addr, u32 flags, u8 bssidx);

extern void dhd_del_if(struct dhd_info *dhd, int ifidx);



extern void dhd_vif_add(struct dhd_info *dhd, int ifidx, char *name);