Deleted Added
full compact
ata-all.c (233274) ata-all.c (233282)
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/ata-all.c 233274 2012-03-21 08:57:15Z marius $");
28__FBSDID("$FreeBSD: head/sys/dev/ata/ata-all.c 233282 2012-03-21 16:59:39Z marius $");
29
30#include "opt_ata.h"
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/ata.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36#include <sys/endian.h>

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

1204 /* for now just use DELAY, the timer/sleep subsytems are not there yet */
1205 if (1 || interval < (1000000/hz) || ata_delayed_attach)
1206 DELAY(interval);
1207 else
1208 pause("ataslp", interval/(1000000/hz));
1209}
1210
1211#ifndef ATA_CAM
29
30#include "opt_ata.h"
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/ata.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36#include <sys/endian.h>

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

1204 /* for now just use DELAY, the timer/sleep subsytems are not there yet */
1205 if (1 || interval < (1000000/hz) || ata_delayed_attach)
1206 DELAY(interval);
1207 else
1208 pause("ataslp", interval/(1000000/hz));
1209}
1210
1211#ifndef ATA_CAM
1212char *
1212const char *
1213ata_unit2str(struct ata_device *atadev)
1214{
1215 struct ata_channel *ch = device_get_softc(device_get_parent(atadev->dev));
1216 static char str[8];
1217
1218 if (ch->devices & ATA_PORTMULTIPLIER)
1219 sprintf(str, "port%d", atadev->unit);
1220 else

--- 754 unchanged lines hidden ---
1213ata_unit2str(struct ata_device *atadev)
1214{
1215 struct ata_channel *ch = device_get_softc(device_get_parent(atadev->dev));
1216 static char str[8];
1217
1218 if (ch->devices & ATA_PORTMULTIPLIER)
1219 sprintf(str, "port%d", atadev->unit);
1220 else

--- 754 unchanged lines hidden ---