Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-19 11:50:10 -08:00
parent 5934d65b75 02bef1e61b
commit 240485473e
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libspl/include/sys/sunddi.h
View File

@ -61,12 +61,18 @@
#define DDI_PROP_DONTPASS 0x0001 /* Don't pass request to parent */ #define DDI_PROP_DONTPASS 0x0001 /* Don't pass request to parent */
#define DDI_PROP_CANSLEEP 0x0002 /* Memory allocation may sleep */ #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_strtoul(const char *, char **, int, unsigned long *);
extern int ddi_strtol(const char *, char **, int, long *); extern int ddi_strtol(const char *, char **, int, long *);
extern int ddi_strtoull(const char *, char **, int, unsigned long long *); extern int ddi_strtoull(const char *, char **, int, unsigned long long *);
extern int ddi_strtoll(const char *, char **, int, 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 int ddi_prop_lookup_string(dev_t, dev_info_t *, uint_t, char *, char **);
extern void ddi_prop_free(void *); extern void ddi_prop_free(void *);

7
lib/libspl/sunddi.c
View File

@ -84,6 +84,13 @@ ddi_strtoll(const char *str, char **endptr, int base,
return errno; return errno;
} }
/* FIXME: Unimplemented */
dev_info_t *
ddi_root_node(void)
{
return NULL;
}
/* FIXME: Unimplemented */ /* FIXME: Unimplemented */
int int
ddi_prop_lookup_string(dev_t match_dev, dev_info_t *dip, uint_t flags, ddi_prop_lookup_string(dev_t match_dev, dev_info_t *dip, uint_t flags,