Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
This commit is contained in:
Brian Behlendorf
commit
ea7cab3c8e
|
|
@ -14,7 +14,6 @@ libspl_la_SOURCES = \
|
|||
${top_srcdir}/lib/libspl/strlcat.c \
|
||||
${top_srcdir}/lib/libspl/strlcpy.c \
|
||||
${top_srcdir}/lib/libspl/strnlen.c \
|
||||
${top_srcdir}/lib/libspl/sunddi.c \
|
||||
${top_srcdir}/lib/libspl/u8_textprep.c \
|
||||
${top_srcdir}/lib/libspl/zone.c \
|
||||
${top_srcdir}/lib/libspl/include/sys/list.h \
|
||||
|
|
|
|||
|
|
@ -26,54 +26,4 @@
|
|||
#ifndef _SYS_SUNDDI_H
|
||||
#define _SYS_SUNDDI_H
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
/*
|
||||
* Generic Sun DDI definitions.
|
||||
*/
|
||||
#define DDI_SUCCESS (0) /* successful return */
|
||||
#define DDI_FAILURE (-1) /* unsuccessful return */
|
||||
#define DDI_NOT_WELL_FORMED (-2) /* A dev_info node is not valid */
|
||||
#define DDI_EAGAIN (-3) /* not enough interrupt resources */
|
||||
#define DDI_EINVAL (-4) /* invalid request or arguments */
|
||||
#define DDI_ENOTSUP (-5) /* operation is not supported */
|
||||
#define DDI_EPENDING (-6) /* operation or an event is pending */
|
||||
|
||||
/*
|
||||
* General-purpose DDI error return value definitions
|
||||
*/
|
||||
#define DDI_ENOMEM 1 /* memory not available */
|
||||
#define DDI_EBUSY 2 /* busy */
|
||||
#define DDI_ETRANSPORT 3 /* transport down */
|
||||
#define DDI_ECONTEXT 4 /* context error */
|
||||
|
||||
/*
|
||||
* DDI_DEV_T_NONE: When creating, property is not associated with
|
||||
* particular dev_t.
|
||||
* DDI_DEV_T_ANY: Wildcard dev_t when searching properties.
|
||||
*/
|
||||
#define DDI_DEV_T_NONE ((dev_t)-1)
|
||||
#define DDI_DEV_T_ANY ((dev_t)-2)
|
||||
|
||||
/*
|
||||
* Property flags:
|
||||
*/
|
||||
#define DDI_PROP_DONTPASS 0x0001 /* Don't pass request to parent */
|
||||
#define DDI_PROP_CANSLEEP 0x0002 /* Memory allocation may sleep */
|
||||
|
||||
typedef struct dev_info {
|
||||
major_t di_major;
|
||||
minor_t di_minor;
|
||||
dev_t di_dev;
|
||||
} dev_info_t;
|
||||
|
||||
extern int ddi_strtoul(const char *, char **, int, unsigned long *);
|
||||
extern int ddi_strtol(const char *, char **, int, long *);
|
||||
extern int ddi_strtoull(const char *, char **, int, unsigned long long *);
|
||||
extern int ddi_strtoll(const char *, char **, int, long long *);
|
||||
|
||||
extern dev_info_t *ddi_root_node(void);
|
||||
extern int ddi_prop_lookup_string(dev_t, dev_info_t *, uint_t, char *, char **);
|
||||
extern void ddi_prop_free(void *);
|
||||
|
||||
#endif /* _SYS_SUNDDI_H */
|
||||
|
|
|
|||
|
|
@ -1,108 +0,0 @@
|
|||
/*
|
||||
* CDDL HEADER START
|
||||
*
|
||||
* The contents of this file are subject to the terms of the
|
||||
* Common Development and Distribution License (the "License").
|
||||
* You may not use this file except in compliance with the License.
|
||||
*
|
||||
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
||||
* or http://www.opensolaris.org/os/licensing.
|
||||
* See the License for the specific language governing permissions
|
||||
* and limitations under the License.
|
||||
*
|
||||
* When distributing Covered Code, include this CDDL HEADER in each
|
||||
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
||||
* If applicable, add the following below this CDDL HEADER, with the
|
||||
* fields enclosed by brackets "[]" replaced with your own identifying
|
||||
* information: Portions Copyright [yyyy] [name of copyright owner]
|
||||
*
|
||||
* CDDL HEADER END
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
|
||||
* Use is subject to license terms.
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#include <sys/sunddi.h>
|
||||
|
||||
int
|
||||
ddi_strtoul(const char *str, char **endptr, int base,
|
||||
unsigned long *result)
|
||||
{
|
||||
unsigned long val;
|
||||
|
||||
errno = 0;
|
||||
val = strtoul(str, endptr, base);
|
||||
if (errno == 0)
|
||||
*result = val;
|
||||
|
||||
return errno;
|
||||
}
|
||||
|
||||
int
|
||||
ddi_strtol(const char *str, char **endptr, int base,
|
||||
long *result)
|
||||
{
|
||||
long val;
|
||||
|
||||
errno = 0;
|
||||
val = strtol(str, endptr, base);
|
||||
if (errno == 0)
|
||||
*result = val;
|
||||
|
||||
return errno;
|
||||
}
|
||||
|
||||
int
|
||||
ddi_strtoull(const char *str, char **endptr, int base,
|
||||
unsigned long long *result)
|
||||
{
|
||||
unsigned long long val;
|
||||
|
||||
errno = 0;
|
||||
val = strtoull(str, endptr, base);
|
||||
if (errno == 0)
|
||||
*result = val;
|
||||
|
||||
return errno;
|
||||
}
|
||||
|
||||
int
|
||||
ddi_strtoll(const char *str, char **endptr, int base,
|
||||
long long *result)
|
||||
{
|
||||
long long val;
|
||||
|
||||
errno = 0;
|
||||
val = strtoll(str, endptr, base);
|
||||
if (errno == 0)
|
||||
*result = val;
|
||||
|
||||
return errno;
|
||||
}
|
||||
|
||||
/* FIXME: Unimplemented */
|
||||
dev_info_t *
|
||||
ddi_root_node(void)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* FIXME: Unimplemented */
|
||||
int
|
||||
ddi_prop_lookup_string(dev_t match_dev, dev_info_t *dip, uint_t flags,
|
||||
char *name, char **data)
|
||||
{
|
||||
*data = NULL;
|
||||
return ENOSYS;
|
||||
}
|
||||
|
||||
/* FIXME: Unimplemented */
|
||||
void
|
||||
ddi_prop_free(void *datap)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -56,7 +56,6 @@ libzpool_la_SOURCES = \
|
|||
${top_srcdir}/module/zfs/spa_config.c \
|
||||
${top_srcdir}/module/zfs/spa_errlog.c \
|
||||
${top_srcdir}/module/zfs/spa_history.c \
|
||||
${top_srcdir}/module/zfs/spa_boot.c \
|
||||
${top_srcdir}/module/zfs/zfs_fm.c \
|
||||
${top_srcdir}/module/zfs/zio.c \
|
||||
${top_srcdir}/module/zfs/zio_checksum.c \
|
||||
|
|
|
|||
Loading…
Reference in New Issue