Deleted Added
full compact
nvme_private.h (244413) nvme_private.h (248732)
1/*-
2 * Copyright (C) 2012 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 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_private.h 244413 2012-12-18 23:27:18Z jimharris $
26 * $FreeBSD: head/sys/dev/nvme/nvme_private.h 248732 2013-03-26 18:23:35Z jimharris $
27 */
28
29#ifndef __NVME_PRIVATE_H__
30#define __NVME_PRIVATE_H__
31
32#include <sys/param.h>
33#include <sys/kernel.h>
34#include <sys/lock.h>

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

343 uint32_t num_queues, nvme_cb_fn_t cb_fn,
344 void *cb_arg);
345void nvme_ctrlr_cmd_set_asynchronous_event_config(struct nvme_controller *ctrlr,
346 union nvme_critical_warning_state state,
347 nvme_cb_fn_t cb_fn, void *cb_arg);
348void nvme_ctrlr_cmd_asynchronous_event_request(struct nvme_controller *ctrlr,
349 nvme_cb_fn_t cb_fn,
350 void *cb_arg);
27 */
28
29#ifndef __NVME_PRIVATE_H__
30#define __NVME_PRIVATE_H__
31
32#include <sys/param.h>
33#include <sys/kernel.h>
34#include <sys/lock.h>

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

343 uint32_t num_queues, nvme_cb_fn_t cb_fn,
344 void *cb_arg);
345void nvme_ctrlr_cmd_set_asynchronous_event_config(struct nvme_controller *ctrlr,
346 union nvme_critical_warning_state state,
347 nvme_cb_fn_t cb_fn, void *cb_arg);
348void nvme_ctrlr_cmd_asynchronous_event_request(struct nvme_controller *ctrlr,
349 nvme_cb_fn_t cb_fn,
350 void *cb_arg);
351void nvme_ctrlr_cmd_abort(struct nvme_controller *ctrlr, uint16_t cid,
352 uint16_t sqid, nvme_cb_fn_t cb_fn, void *cb_arg);
351
352void nvme_payload_map(void *arg, bus_dma_segment_t *seg, int nseg,
353 int error);
354void nvme_payload_map_uio(void *arg, bus_dma_segment_t *seg, int nseg,
355 bus_size_t mapsize, int error);
356
357int nvme_ctrlr_construct(struct nvme_controller *ctrlr, device_t dev);
358int nvme_ctrlr_reset(struct nvme_controller *ctrlr);

--- 76 unchanged lines hidden ---
353
354void nvme_payload_map(void *arg, bus_dma_segment_t *seg, int nseg,
355 int error);
356void nvme_payload_map_uio(void *arg, bus_dma_segment_t *seg, int nseg,
357 bus_size_t mapsize, int error);
358
359int nvme_ctrlr_construct(struct nvme_controller *ctrlr, device_t dev);
360int nvme_ctrlr_reset(struct nvme_controller *ctrlr);

--- 76 unchanged lines hidden ---