diff options
| author | srivijitha dugganapalli <Srivijitha.Dugganapalli@Sun.COM> | 2009-04-09 13:20:50 -0600 |
|---|---|---|
| committer | srivijitha dugganapalli <Srivijitha.Dugganapalli@Sun.COM> | 2009-04-09 13:20:50 -0600 |
| commit | ed141cfca535fc26451c4bd9a2cfb6172af449c2 (patch) | |
| tree | 01e3ccb2e213367d3986226d0032be51eeb4eadc /usr/src/lib/libdevid | |
| parent | ee9c203b1f94e95f194b035c4166c79fab792a78 (diff) | |
| download | illumos-joyent-ed141cfca535fc26451c4bd9a2cfb6172af449c2.tar.gz | |
6818457 libdevid include/mapfile don't correctly identify private interfaces
Diffstat (limited to 'usr/src/lib/libdevid')
| -rw-r--r-- | usr/src/lib/libdevid/libdevid.h | 27 | ||||
| -rw-r--r-- | usr/src/lib/libdevid/mapfile-vers | 6 |
2 files changed, 27 insertions, 6 deletions
diff --git a/usr/src/lib/libdevid/libdevid.h b/usr/src/lib/libdevid/libdevid.h index 348d602ecd..f5df7c10e6 100644 --- a/usr/src/lib/libdevid/libdevid.h +++ b/usr/src/lib/libdevid/libdevid.h @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -20,15 +19,13 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #ifndef _LIBDEVID_H #define _LIBDEVID_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <errno.h> #include <sys/param.h> #include <sys/sunddi.h> @@ -45,6 +42,24 @@ extern "C" { */ extern int devid_str_compare(char *devid1_str, char *devid2_str); +extern int devid_scsi_encode(int version, char *driver_name, uchar_t *inq, + size_t inq_len, uchar_t *inq80, size_t inq80_len, + uchar_t *inq83, size_t inq83_len, ddi_devid_t *devid); + +extern char *devid_to_guid(ddi_devid_t devid); +extern void devid_free_guid(char *guid); + +extern int scsi_wwnstr_to_wwn(const char *wwnstr, uint64_t *wwnp); +extern char *scsi_wwn_to_wwnstr(uint64_t wwn, + int unit_address_form, char *wwnstr); +extern void scsi_wwnstr_hexcase(char *wwnstr, int lower_case); +extern void scsi_free_wwnstr(char *wwnstr); + +#ifdef SCSI_ADDR_PROP_LUN64 +extern scsi_lun64_t scsi_lun_to_lun64(scsi_lun_t lun); +extern scsi_lun_t scsi_lun64_to_lun(scsi_lun64_t lun64); +#endif /* SCSI_ADDR_PROP_LUN64 */ + #ifdef __cplusplus } #endif diff --git a/usr/src/lib/libdevid/mapfile-vers b/usr/src/lib/libdevid/mapfile-vers index ff4526da63..48d9e987ad 100644 --- a/usr/src/lib/libdevid/mapfile-vers +++ b/usr/src/lib/libdevid/mapfile-vers @@ -62,6 +62,12 @@ SUNWprivate_1.1 { devid_scsi_encode; devid_str_compare; devid_to_guid; + scsi_free_wwnstr; + scsi_lun64_to_lun; + scsi_lun_to_lun64; + scsi_wwn_to_wwnstr; + scsi_wwnstr_hexcase; + scsi_wwnstr_to_wwn; local: *; }; |