diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/fruadm/fruadm.c | 7 | ||||
| -rw-r--r-- | usr/src/cmd/picl/plugins/sun4u/frudata/fru_data.h | 6 | ||||
| -rw-r--r-- | usr/src/lib/libfru/libfru/PayloadReader.cc | 6 | ||||
| -rw-r--r-- | usr/src/lib/libfruutils/fru_tag.c | 6 |
4 files changed, 13 insertions, 12 deletions
diff --git a/usr/src/cmd/fruadm/fruadm.c b/usr/src/cmd/fruadm/fruadm.c index 6a1e533c08..210d247853 100644 --- a/usr/src/cmd/fruadm/fruadm.c +++ b/usr/src/cmd/fruadm/fruadm.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -150,7 +150,7 @@ displayBinary(unsigned char *data, size_t length, fru_elemdef_t *def) switch (def->disp_type) { case FDISP_Binary: { - mask = 0x8000000000000000; + mask = 0x8000000000000000ULL; for (i = 0; i < (sizeof (uint64_t) *8); i++) { if (lldata & (mask >> i)) { (void) printf("1"); @@ -430,7 +430,8 @@ convert_update(fru_nodehdl_t nodehdl, char *segment, char *field_name, for (i = 0; i < def.enum_count; i++) { if (strcmp(def.enum_table[i].text, field_value) == 0) { - data = (void *)def.enum_table[i].value; + data = (void *)(uintptr_t) + def.enum_table[i].value; dataLen = sizeof (uint64_t); break; } diff --git a/usr/src/cmd/picl/plugins/sun4u/frudata/fru_data.h b/usr/src/cmd/picl/plugins/sun4u/frudata/fru_data.h index 22794b9de1..22d0bedcdc 100644 --- a/usr/src/cmd/picl/plugins/sun4u/frudata/fru_data.h +++ b/usr/src/cmd/picl/plugins/sun4u/frudata/fru_data.h @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 2000 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ @@ -35,7 +35,7 @@ extern "C" { #endif #define FRUDATA_DELETE_TAG_KEY (0xDEAD) -#define FRUDATA_DELETE_TAG_MASK (0xFFFFFFFFFFFF0000) +#define FRUDATA_DELETE_TAG_MASK (0xFFFFFFFFFFFF0000ULL) #ifdef __cplusplus } diff --git a/usr/src/lib/libfru/libfru/PayloadReader.cc b/usr/src/lib/libfru/libfru/PayloadReader.cc index 2eb7d736a0..60a347f31d 100644 --- a/usr/src/lib/libfru/libfru/PayloadReader.cc +++ b/usr/src/lib/libfru/libfru/PayloadReader.cc @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 2000-2001 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -56,7 +56,7 @@ writeBits(uint64_t bitData, size_t bitLength, } mask = (mask << (64-bitLength)); mask = (mask >> bitOffset); - mask = (mask ^ 0xFFFFFFFFFFFFFFFF); + mask = (mask ^ 0xFFFFFFFFFFFFFFFFULL); // get the data out of the byte array. uint64_t rd = 0; diff --git a/usr/src/lib/libfruutils/fru_tag.c b/usr/src/lib/libfruutils/fru_tag.c index 9b816707ce..1e5032971e 100644 --- a/usr/src/lib/libfruutils/fru_tag.c +++ b/usr/src/lib/libfruutils/fru_tag.c @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 2000 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -79,7 +79,7 @@ int mk_tag(fru_tagtype_t type, uint32_t dense, size_t pl_len, fru_tag_t *tag) { - static fru_tag_t max = { 0xFFFFFFFFFFFFFFFF }; + static fru_tag_t max = { 0xFFFFFFFFFFFFFFFFULL }; /* make sure the tag is clear. */ tag->raw_data = 0; |