diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/sun/io/ttymux/ttymux_ioctl.c | 9 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/montecarlo/io/ttymux_dacf/ttymux_dacf.c | 11 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/snowbird/io/todds1307/todds1307.c | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/usr/src/uts/sun/io/ttymux/ttymux_ioctl.c b/usr/src/uts/sun/io/ttymux/ttymux_ioctl.c index 24aac97c94..e3aa089ced 100644 --- a/usr/src/uts/sun/io/ttymux/ttymux_ioctl.c +++ b/usr/src/uts/sun/io/ttymux/ttymux_ioctl.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2001-2002 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" @@ -892,9 +892,9 @@ sm_iocresp(mblk_t *mp) sm_dbg('M', ("M_IOCDATA: result is %d\n", csp->cp_rval)); DB_TYPE(mp) = M_IOCNAK; - iobp->ioc_error = (int)csp->cp_rval; + iobp->ioc_error = (int)(uintptr_t)csp->cp_rval; iobp->ioc_rval = 0; - return ((int)csp->cp_rval); + return (iobp->ioc_error); } pmp = (mblk_t *)csp->cp_private; @@ -980,7 +980,8 @@ ttymux_query_links_ioctl(mblk_t *mp) if ((iobp->ioc_flag & IOC_MODELS) != IOC_NATIVE) { cnt = ((ttymux_assocs32_t *)asl)->ttymux32_nlinks; sz = cnt * sizeof (ttymux_assoc32_t); - uaddr = (void *)((ttymux_assocs32_t *)asl)->ttymux32_assocs; + uaddr = (void *)(uintptr_t) + ((ttymux_assocs32_t *)asl)->ttymux32_assocs; } else #endif { diff --git a/usr/src/uts/sun4u/montecarlo/io/ttymux_dacf/ttymux_dacf.c b/usr/src/uts/sun4u/montecarlo/io/ttymux_dacf/ttymux_dacf.c index b99cf3d17c..2706bf0d7a 100644 --- a/usr/src/uts/sun4u/montecarlo/io/ttymux_dacf/ttymux_dacf.c +++ b/usr/src/uts/sun4u/montecarlo/io/ttymux_dacf/ttymux_dacf.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -450,8 +450,9 @@ add_aconsole(sm_mux_state_t *ms, char *path, void *arg) cpath = p; } if ((cn = get_aconsole(ms, cpath)) != NULL) { - cn->sm_obp_con = ((uint_t)arg & OBPDEV) ? B_TRUE : B_FALSE; - cn->sm_mode |= (io_mode_t)((uint_t)arg & FORIO); + cn->sm_obp_con = ((uint_t)(uintptr_t)arg & OBPDEV) ? + B_TRUE : B_FALSE; + cn->sm_mode |= (io_mode_t)((uint_t)(uintptr_t)arg & FORIO); if (cn->sm_path != NULL) kmem_free(cn->sm_path, strlen(cn->sm_path) + 1); cn->sm_path = cpath; @@ -764,8 +765,8 @@ find_consoles(sm_mux_state_t *ms, dev_info_t *dip, dev_t dev) * Assume that they are OBP consoles and used for both input and output. */ flags = (uint_t)FORIO | OBPDEV; - if ((propval = platform_consoles(ms, dip, dev, flags)) != (char *)0) { - parse(ms, propval, add_aconsole, (void *)flags); + if ((propval = platform_consoles(ms, dip, dev, flags)) != NULL) { + parse(ms, propval, add_aconsole, (void *)(uintptr_t)flags); kmem_free(propval, strlen(propval) + 1); } diff --git a/usr/src/uts/sun4u/snowbird/io/todds1307/todds1307.c b/usr/src/uts/sun4u/snowbird/io/todds1307/todds1307.c index b02f84bce0..6eccb146e0 100644 --- a/usr/src/uts/sun4u/snowbird/io/todds1307/todds1307.c +++ b/usr/src/uts/sun4u/snowbird/io/todds1307/todds1307.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -646,7 +646,7 @@ todds1307_getinfo(dev_info_t *dip, ddi_info_cmd_t infocmd, void *arg, return (DDI_SUCCESS); case DDI_INFO_DEVT2INSTANCE: - *result = (void *)instance; + *result = (void *)(uintptr_t)instance; return (DDI_SUCCESS); default: |