Deleted Added
full compact
ata-siliconimage.c (230132) ata-siliconimage.c (230627)
1/*-
2 * Copyright (c) 1998 - 2008 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

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

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 - 2008 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

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

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/ata/chipsets/ata-siliconimage.c 230132 2012-01-15 13:23:18Z uqs $");
28__FBSDID("$FreeBSD: head/sys/dev/ata/chipsets/ata-siliconimage.c 230627 2012-01-27 21:52:59Z marius $");
29
30#include "opt_ata.h"
31#include <sys/param.h>
32#include <sys/module.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/ata.h>
36#include <sys/bus.h>

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

235
236 /* setup the usual register normal pci style */
237 if (ata_pci_ch_attach(dev))
238 return ENXIO;
239
240 if (ctlr->chip->cfg2 & SII_INTR)
241 ch->hw.status = ata_cmd_status;
242
29
30#include "opt_ata.h"
31#include <sys/param.h>
32#include <sys/module.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/ata.h>
36#include <sys/bus.h>

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

235
236 /* setup the usual register normal pci style */
237 if (ata_pci_ch_attach(dev))
238 return ENXIO;
239
240 if (ctlr->chip->cfg2 & SII_INTR)
241 ch->hw.status = ata_cmd_status;
242
243#ifdef ATA_CAM
244 ch->flags |= ATA_NO_ATAPI_DMA;
245#endif
246
243 return 0;
244}
245
246static int
247ata_cmd_status(device_t dev)
248{
249 struct ata_channel *ch = device_get_softc(dev);
250 u_int8_t reg71;

--- 698 unchanged lines hidden ---
247 return 0;
248}
249
250static int
251ata_cmd_status(device_t dev)
252{
253 struct ata_channel *ch = device_get_softc(dev);
254 u_int8_t reg71;

--- 698 unchanged lines hidden ---