Attachment #46101 for bug #74586

View | Details | Raw Unified | Return to bug 74586
Collapse All | Expand All




#define ipw_read16(ipw, ofs) __ipw_read16(__FILE__, __LINE__, ipw, ofs)

#define _ipw_read32(ipw, ofs) readl((void*)(ipw)->hw_base + (ofs))
static u32 __ipw_read32(char *f, u32 l, struct ipw_priv *ipw, u32 ofs) {
	IPW_DEBUG_IO("%s %d: read_direct32(0x%08X)\n", f, l, (u32)(ofs));
	return _ipw_read32(ipw, ofs);
}

	cb->status = control ^src_address ^dest_address;

	/* Copy the Source and Destination addresses */
	cb->dest_addr = dest_address;
	cb->source_addr = src_address;

	/* Copy the Control Word last */
	cb->control = control;

	}

	pci_set_master(pdev);
#define PCI_DMA_32BIT 0x00000000ffffffffULL
       err = pci_set_dma_mask(pdev, PCI_DMA_32BIT);
       if (!err) {
               pci_set_consistent_dma_mask(pdev, PCI_DMA_32BIT);
       } else {
               printk(KERN_WARNING DRV_NAME ": No suitable DMA available.\n");
               goto out_pci_disable_device;
       }

	pci_set_drvdata(pdev, priv);

	err = pci_request_regions(pdev, DRV_NAME);

Lines 661-668 Link Here

(-)ipw2200-0.18/ipw2200.h (-2 / +2 lines)
661	struct command_block	661	struct command_block
662	{	662	{
663	unsigned int control;	663	unsigned int control;
664	void *source_addr;	664	u32 source_addr;
665	void *dest_addr;	665	u32 dest_addr;
666	unsigned int status;	666	unsigned int status;
667	} __attribute__ ((packed));	667	} __attribute__ ((packed));
668		668

Return to bug 74586

Lines 210-216 Link Here

(-)ipw2200-0.18/ipw2200.c (-3 / +12 lines)
210	#define ipw_read16(ipw, ofs) __ipw_read16(__FILE__, __LINE__, ipw, ofs)	210	#define ipw_read16(ipw, ofs) __ipw_read16(__FILE__, __LINE__, ipw, ofs)
211		211
212	#define _ipw_read32(ipw, ofs) readl((void*)(ipw)->hw_base + (ofs))	212	#define _ipw_read32(ipw, ofs) readl((void*)(ipw)->hw_base + (ofs))
213	static inline u32 __ipw_read32(char f, u32 l, struct ipw_priv ipw, u32 ofs) {	213	static u32 __ipw_read32(char f, u32 l, struct ipw_priv ipw, u32 ofs) {
214	IPW_DEBUG_IO("%s %d: read_direct32(0x%08X)\n", f, l, (u32)(ofs));	214	IPW_DEBUG_IO("%s %d: read_direct32(0x%08X)\n", f, l, (u32)(ofs));
215	return _ipw_read32(ipw, ofs);	215	return _ipw_read32(ipw, ofs);
216	}	216	}
Lines 1827-1834 Link Here
1827	cb->status = control ^src_address ^dest_address;	1827	cb->status = control ^src_address ^dest_address;
1828		1828
1829	/* Copy the Source and Destination addresses */	1829	/* Copy the Source and Destination addresses */
1830	cb->dest_addr = (void *)dest_address;	1830	cb->dest_addr = dest_address;
1831	cb->source_addr = (void *)src_address;	1831	cb->source_addr = src_address;
1832		1832
1833	/* Copy the Control Word last */	1833	/* Copy the Control Word last */
1834	cb->control = control;	1834	cb->control = control;
Lines 6817-6822 Link Here
6817	}	6817	}
6818		6818
6819	pci_set_master(pdev);	6819	pci_set_master(pdev);
		6820	#define PCI_DMA_32BIT 0x00000000ffffffffULL
		6821	err = pci_set_dma_mask(pdev, PCI_DMA_32BIT);
		6822	if (!err) {
		6823	pci_set_consistent_dma_mask(pdev, PCI_DMA_32BIT);
		6824	} else {
		6825	printk(KERN_WARNING DRV_NAME ": No suitable DMA available.\n");
		6826	goto out_pci_disable_device;
		6827	}
		6828
6820	pci_set_drvdata(pdev, priv);	6829	pci_set_drvdata(pdev, priv);
6821		6830
6822	err = pci_request_regions(pdev, DRV_NAME);	6831	err = pci_request_regions(pdev, DRV_NAME);