Attachment 10417 Details for Bug 20895 – file.diff

[patch] file.diff

file.diff (text/plain), 1.80 KB, created by hiramoto on 2000-08-28 10:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: hiramoto

Created: 2000-08-28 10:20:03 UTC

Size: 1.80 KB

patch

obsolete

>*** sym_hipd.c.orig	Mon Jul  3 15:21:53 2000
>--- sym_hipd.c	Mon Aug 28 02:39:07 2000
>***************
>*** 9057,9066 ****
>  	    (command & PCIM_CMD_MEMEN) != 0) {
>  #ifdef FreeBSD_Bus_Io_Abstraction
>  		int regs_id = SYM_PCI_RAM;
>! 		if (np->features & FE_64BIT)
>  			regs_id = SYM_PCI_RAM64;
>! 		np->ram_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &regs_id,
>! 						 0, ~0, 1, RF_ACTIVE);
>  		if (!np->ram_res) {
>  			device_printf(dev,"failed to allocate RAM resources\n");
>  			goto attach_failed;
>--- 9057,9072 ----
>  	    (command & PCIM_CMD_MEMEN) != 0) {
>  #ifdef FreeBSD_Bus_Io_Abstraction
>  		int regs_id = SYM_PCI_RAM;
>! 		if (np->features & FE_64BIT) {
>  			regs_id = SYM_PCI_RAM64;
>! 			np->ram_res = bus_alloc_resource(dev, SYS_RES_MEMORY,
>! 						&regs_id, 0, ~0, 1, RF_ACTIVE);
>! 			if (!np->ram_res)
>! 				regs_id = SYM_PCI_RAM;
>! 		}
>! 		if (regs_id == SYM_PCI_RAM)
>! 			np->ram_res = bus_alloc_resource(dev, SYS_RES_MEMORY,
>! 						&regs_id, 0, ~0, 1, RF_ACTIVE);
>  		if (!np->ram_res) {
>  			device_printf(dev,"failed to allocate RAM resources\n");
>  			goto attach_failed;
>***************
>*** 9074,9082 ****
>  #else
>  		vm_offset_t vaddr, paddr;
>  		int regs_id = SYM_PCI_RAM;
>! 		if (np->features & FE_64BIT)
>  			regs_id = SYM_PCI_RAM64;
>! 		if (!pci_map_mem(pci_tag, regs_id, &vaddr, &paddr)) {
>  			printf("%s: failed to map RAM window\n", sym_name(np));
>  			goto attach_failed;
>  		}
>--- 9080,9092 ----
>  #else
>  		vm_offset_t vaddr, paddr;
>  		int regs_id = SYM_PCI_RAM;
>! 		if (np->features & FE_64BIT) {
>  			regs_id = SYM_PCI_RAM64;
>! 			if (!pci_map_mem(pci_tag, regs_id, &vaddr, &paddr))
>! 				regs_id = SYM_PCI_RAM;
>! 		}
>! 		if (regs_id == SYM_PCI_RAM &&
>! 		    !pci_map_mem(pci_tag, regs_id, &vaddr, &paddr)) {
>  			printf("%s: failed to map RAM window\n", sym_name(np));
>  			goto attach_failed;
>  		}

Actions: View | Diff

Attachments on bug 20895: 10417