Deleted Added
full compact
nvme.h (253437) nvme.h (253476)
1/*-
2 * Copyright (C) 2012-2013 Intel Corporation
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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (C) 2012-2013 Intel Corporation
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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/dev/nvme/nvme.h 253437 2013-07-17 23:23:38Z jimharris $
26 * $FreeBSD: head/sys/dev/nvme/nvme.h 253476 2013-07-19 21:40:57Z jimharris $
27 */
28
29#ifndef __NVME_H__
30#define __NVME_H__
31
32#ifdef _KERNEL
33#include <sys/types.h>
34#endif

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

399
400 /** pci vendor id */
401 uint16_t vid;
402
403 /** pci subsystem vendor id */
404 uint16_t ssvid;
405
406 /** serial number */
27 */
28
29#ifndef __NVME_H__
30#define __NVME_H__
31
32#ifdef _KERNEL
33#include <sys/types.h>
34#endif

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

399
400 /** pci vendor id */
401 uint16_t vid;
402
403 /** pci subsystem vendor id */
404 uint16_t ssvid;
405
406 /** serial number */
407 int8_t sn[NVME_SERIAL_NUMBER_LENGTH];
407 uint8_t sn[NVME_SERIAL_NUMBER_LENGTH];
408
409 /** model number */
408
409 /** model number */
410 int8_t mn[NVME_MODEL_NUMBER_LENGTH];
410 uint8_t mn[NVME_MODEL_NUMBER_LENGTH];
411
412 /** firmware revision */
413 uint8_t fr[NVME_FIRMWARE_REVISION_LENGTH];
414
415 /** recommended arbitration burst */
416 uint8_t rab;
417
418 /** ieee oui identifier */

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

781 * by the caller.
782 */
783 struct mtx * driver_lock;
784};
785
786#define nvme_completion_is_error(cpl) \
787 ((cpl)->status.sc != 0 || (cpl)->status.sct != 0)
788
411
412 /** firmware revision */
413 uint8_t fr[NVME_FIRMWARE_REVISION_LENGTH];
414
415 /** recommended arbitration burst */
416 uint8_t rab;
417
418 /** ieee oui identifier */

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

781 * by the caller.
782 */
783 struct mtx * driver_lock;
784};
785
786#define nvme_completion_is_error(cpl) \
787 ((cpl)->status.sc != 0 || (cpl)->status.sct != 0)
788
789void nvme_strvis(uint8_t *dst, const uint8_t *src, int dstlen, int srclen);
790
789#ifdef _KERNEL
790
791struct bio;
792
793struct nvme_namespace;
794struct nvme_controller;
795struct nvme_consumer;
796

--- 78 unchanged lines hidden ---
791#ifdef _KERNEL
792
793struct bio;
794
795struct nvme_namespace;
796struct nvme_controller;
797struct nvme_consumer;
798

--- 78 unchanged lines hidden ---