Deleted Added
full compact
ata-card.c (145000) ata-card.c (145499)
1/*-
2 * Copyright (c) 1998 - 2005 S�ren Schmidt <sos@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 - 2005 S�ren Schmidt <sos@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/dev/ata/ata-card.c 145000 2005-04-13 07:14:17Z sos $");
30__FBSDID("$FreeBSD: head/sys/dev/ata/ata-card.c 145499 2005-04-25 07:57:04Z sos $");
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/ata.h>
35#include <sys/kernel.h>
36#include <sys/module.h>
37#include <sys/bus.h>
38#include <sys/malloc.h>

--- 25 unchanged lines hidden (view full) ---

64
65static int
66ata_pccard_match(device_t dev)
67{
68 const struct pccard_product *pp;
69 u_int32_t fcn = PCCARD_FUNCTION_UNSPEC;
70 int error = 0;
71
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/ata.h>
35#include <sys/kernel.h>
36#include <sys/module.h>
37#include <sys/bus.h>
38#include <sys/malloc.h>

--- 25 unchanged lines hidden (view full) ---

64
65static int
66ata_pccard_match(device_t dev)
67{
68 const struct pccard_product *pp;
69 u_int32_t fcn = PCCARD_FUNCTION_UNSPEC;
70 int error = 0;
71
72 error = pccard_get_function(dev, &fcn);
73 if (error != 0)
74 return (error);
72 if ((error = pccard_get_function(dev, &fcn)))
73 return error;
75
76 /* if it says its a disk we should register it */
77 if (fcn == PCCARD_FUNCTION_DISK)
74
75 /* if it says its a disk we should register it */
76 if (fcn == PCCARD_FUNCTION_DISK)
78 return (0);
77 return 0;
79
80 /* match other devices here, primarily cdrom/dvd rom */
81 if ((pp = pccard_product_lookup(dev, ata_pccard_products,
82 sizeof(ata_pccard_products[0]), NULL))) {
83 if (pp->pp_name)
84 device_set_desc(dev, pp->pp_name);
78
79 /* match other devices here, primarily cdrom/dvd rom */
80 if ((pp = pccard_product_lookup(dev, ata_pccard_products,
81 sizeof(ata_pccard_products[0]), NULL))) {
82 if (pp->pp_name)
83 device_set_desc(dev, pp->pp_name);
85 return (0);
84 return 0;
86 }
85 }
87 return(ENXIO);
86 return ENXIO;
88}
89
90static int
91ata_pccard_probe(device_t dev)
92{
93 struct ata_channel *ch = device_get_softc(dev);
94 struct resource *io, *ctlio;
95 int i, rid;
96
97 /* allocate the io range to get start and length */
98 rid = ATA_IOADDR_RID;
87}
88
89static int
90ata_pccard_probe(device_t dev)
91{
92 struct ata_channel *ch = device_get_softc(dev);
93 struct resource *io, *ctlio;
94 int i, rid;
95
96 /* allocate the io range to get start and length */
97 rid = ATA_IOADDR_RID;
99 io = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
100 ATA_IOSIZE, RF_ACTIVE);
101 if (!io)
98 if (!(io = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
99 ATA_IOSIZE, RF_ACTIVE)))
102 return ENXIO;
103
104 /* setup the resource vectors */
105 for (i = ATA_DATA; i <= ATA_COMMAND; i++) {
106 ch->r_io[i].res = io;
107 ch->r_io[i].offset = i;
108 }
109 ch->r_io[ATA_IDX_ADDR].res = io;
110
111 /*
112 * if we got more than the default ATA_IOSIZE ports, this is a device
113 * where ctlio is located at offset 14 into "normal" io space.
114 */
115 if (rman_get_size(io) > ATA_IOSIZE) {
116 ch->r_io[ATA_CONTROL].res = io;
117 ch->r_io[ATA_CONTROL].offset = 14;
118 }
119 else {
120 rid = ATA_CTLADDR_RID;
100 return ENXIO;
101
102 /* setup the resource vectors */
103 for (i = ATA_DATA; i <= ATA_COMMAND; i++) {
104 ch->r_io[i].res = io;
105 ch->r_io[i].offset = i;
106 }
107 ch->r_io[ATA_IDX_ADDR].res = io;
108
109 /*
110 * if we got more than the default ATA_IOSIZE ports, this is a device
111 * where ctlio is located at offset 14 into "normal" io space.
112 */
113 if (rman_get_size(io) > ATA_IOSIZE) {
114 ch->r_io[ATA_CONTROL].res = io;
115 ch->r_io[ATA_CONTROL].offset = 14;
116 }
117 else {
118 rid = ATA_CTLADDR_RID;
121 ctlio = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
122 ATA_CTLIOSIZE, RF_ACTIVE);
123 if (!ctlio) {
119 if (!(ctlio = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
120 ATA_CTLIOSIZE, RF_ACTIVE))) {
124 bus_release_resource(dev, SYS_RES_IOPORT, ATA_IOADDR_RID, io);
125 for (i = ATA_DATA; i < ATA_MAX_RES; i++)
126 ch->r_io[i].res = NULL;
127 return ENXIO;
128 }
129 ch->r_io[ATA_CONTROL].res = ctlio;
130 ch->r_io[ATA_CONTROL].offset = 0;
131 }

--- 59 unchanged lines hidden ---
121 bus_release_resource(dev, SYS_RES_IOPORT, ATA_IOADDR_RID, io);
122 for (i = ATA_DATA; i < ATA_MAX_RES; i++)
123 ch->r_io[i].res = NULL;
124 return ENXIO;
125 }
126 ch->r_io[ATA_CONTROL].res = ctlio;
127 ch->r_io[ATA_CONTROL].offset = 0;
128 }

--- 59 unchanged lines hidden ---