diff options
Diffstat (limited to 'usr')
112 files changed, 2206 insertions, 2312 deletions
diff --git a/usr/src/boot/lib/libstand/cd9660.c b/usr/src/boot/lib/libstand/cd9660.c index c28a8b222d..8b8aa36d6c 100644 --- a/usr/src/boot/lib/libstand/cd9660.c +++ b/usr/src/boot/lib/libstand/cd9660.c @@ -143,7 +143,7 @@ susp_lookup_record(struct open_file *f, const char *identifier, if (bcmp(sh->type, SUSP_CONTINUATION, 2) == 0) { shc = (ISO_RRIP_CONT *)sh; error = f->f_dev->dv_strategy(f->f_devdata, F_READ, - cdb2devb(isonum_733(shc->location)), 0, + cdb2devb(isonum_733(shc->location)), ISO_DEFAULT_BLOCK_SIZE, susp_buffer, &read); /* Bail if it fails. */ @@ -288,7 +288,7 @@ cd9660_open(const char *path, struct open_file *f) for (bno = 16;; bno++) { twiddle(1); rc = f->f_dev->dv_strategy(f->f_devdata, F_READ, cdb2devb(bno), - 0, ISO_DEFAULT_BLOCK_SIZE, buf, &read); + ISO_DEFAULT_BLOCK_SIZE, buf, &read); if (rc) goto out; if (read != ISO_DEFAULT_BLOCK_SIZE) { @@ -323,7 +323,7 @@ cd9660_open(const char *path, struct open_file *f) rc = f->f_dev->dv_strategy (f->f_devdata, F_READ, cdb2devb(bno + boff), - 0, ISO_DEFAULT_BLOCK_SIZE, + ISO_DEFAULT_BLOCK_SIZE, buf, &read); if (rc) goto out; @@ -387,7 +387,7 @@ cd9660_open(const char *path, struct open_file *f) bno = isonum_733(rec.extent) + isonum_711(rec.ext_attr_length); twiddle(1); rc = f->f_dev->dv_strategy(f->f_devdata, F_READ, cdb2devb(bno), - 0, ISO_DEFAULT_BLOCK_SIZE, buf, &read); + ISO_DEFAULT_BLOCK_SIZE, buf, &read); if (rc) goto out; if (read != ISO_DEFAULT_BLOCK_SIZE) { @@ -444,7 +444,7 @@ buf_read_file(struct open_file *f, char **buf_p, size_t *size_p) twiddle(16); rc = f->f_dev->dv_strategy(f->f_devdata, F_READ, - cdb2devb(blkno), 0, ISO_DEFAULT_BLOCK_SIZE, + cdb2devb(blkno), ISO_DEFAULT_BLOCK_SIZE, fp->f_buf, &read); if (rc) return (rc); diff --git a/usr/src/boot/lib/libstand/dosfs.c b/usr/src/boot/lib/libstand/dosfs.c index 652ac92cae..6cf50b8ba2 100644 --- a/usr/src/boot/lib/libstand/dosfs.c +++ b/usr/src/boot/lib/libstand/dosfs.c @@ -154,7 +154,7 @@ static int fatcnt(DOS_FS *, u_int); static int fatget(DOS_FS *, u_int *); static int fatend(u_int, u_int); static int ioread(DOS_FS *, u_int, void *, u_int); -static int ioget(struct open_file *, daddr_t, size_t, void *, u_int); +static int ioget(struct open_file *, daddr_t, void *, u_int); static void dos_read_fat(DOS_FS *fs, struct open_file *fd) @@ -172,7 +172,7 @@ dos_read_fat(DOS_FS *fs, struct open_file *fd) fat.buf = malloc(secbyt(fs->spf)); if (fat.buf != NULL) { - if (ioget(fd, fs->lsnfat, 0, fat.buf, secbyt(fs->spf)) == 0) { + if (ioget(fd, fs->lsnfat, fat.buf, secbyt(fs->spf)) == 0) { fat.size = fs->spf; fat.unit = dd->d_unit; return; @@ -199,12 +199,12 @@ dos_mount(DOS_FS *fs, struct open_file *fd) fs->fd = fd; if ((err = !(buf = malloc(secbyt(1))) ? errno : 0) || - (err = ioget(fs->fd, 0, 0, buf, secbyt(1))) || + (err = ioget(fs->fd, 0, buf, secbyt(1))) || (err = parsebs(fs, (DOS_BS *)buf))) { if (buf != NULL) free(buf); (void)dosunmount(fs); - return(err); + return (err); } free(buf); @@ -219,7 +219,7 @@ dos_mount(DOS_FS *fs, struct open_file *fd) fs->root.dex.h_clus[0] = (fs->rdcl >> 16) & 0xff; fs->root.dex.h_clus[1] = (fs->rdcl >> 24) & 0xff; } - return 0; + return (0); } /* @@ -231,10 +231,10 @@ dos_unmount(DOS_FS *fs) int err; if (fs->links) - return(EBUSY); + return (EBUSY); if ((err = dosunmount(fs))) - return(err); - return 0; + return (err); + return (0); } /* @@ -244,7 +244,7 @@ static int dosunmount(DOS_FS *fs) { free(fs); - return(0); + return (0); } /* @@ -285,7 +285,7 @@ dos_open(const char *path, struct open_file *fd) fd->f_fsdata = (void *)f; out: - return(err); + return (err); } /* @@ -307,7 +307,7 @@ dos_read(struct open_file *fd, void *buf, size_t nbyte, size_t *resid) twiddle(4); nb = (u_int)nbyte; if ((size = fsize(f->fs, &f->de)) == -1) - return EINVAL; + return (EINVAL); if (nb > (n = size - f->offset)) nb = n; off = f->offset; @@ -344,7 +344,7 @@ dos_read(struct open_file *fd, void *buf, size_t nbyte, size_t *resid) out: if (resid) *resid = nbyte - nb + cnt; - return(err); + return (err); } /* @@ -370,16 +370,16 @@ dos_seek(struct open_file *fd, off_t offset, int whence) break; default: errno = EINVAL; - return(-1); + return (-1); } off += offset; if (off < 0 || off > size) { errno = EINVAL; - return(-1); + return (-1); } f->offset = (u_int)off; f->c = 0; - return(off); + return (off); } /* @@ -394,7 +394,7 @@ dos_close(struct open_file *fd) f->fs->links--; free(f); dos_unmount(fs); - return 0; + return (0); } /* @@ -411,7 +411,7 @@ dos_stat(struct open_file *fd, struct stat *sb) sb->st_uid = 0; sb->st_gid = 0; if ((sb->st_size = fsize(f->fs, &f->de)) == -1) - return EINVAL; + return (EINVAL); return (0); } @@ -501,7 +501,7 @@ dos_readdir(struct open_file *fd, struct dirent *d) d->d_reclen = sizeof(*d); d->d_type = (dd.de.attr & FA_DIR) ? DT_DIR : DT_REG; memcpy(d->d_name, fn, sizeof(d->d_name)); - return(0); + return (0); } /* @@ -516,41 +516,41 @@ parsebs(DOS_FS *fs, DOS_BS *bs) bs->jmp[0] != 0xe9 && (bs->jmp[0] != 0xeb || bs->jmp[2] != 0x90)) || bs->bpb.media < 0xf0) - return EINVAL; + return (EINVAL); if (cv2(bs->bpb.secsiz) != SECSIZ) - return EINVAL; + return (EINVAL); if (!(fs->spc = bs->bpb.spc) || fs->spc & (fs->spc - 1)) - return EINVAL; + return (EINVAL); fs->bsize = secbyt(fs->spc); fs->bshift = ffs(fs->bsize) - 1; if ((fs->spf = cv2(bs->bpb.spf))) { if (bs->bpb.fats != 2) - return EINVAL; + return (EINVAL); if (!(fs->dirents = cv2(bs->bpb.dirents))) - return EINVAL; + return (EINVAL); } else { if (!(fs->spf = cv4(bs->bpb.lspf))) - return EINVAL; + return (EINVAL); if (!bs->bpb.fats || bs->bpb.fats > 16) - return EINVAL; + return (EINVAL); if ((fs->rdcl = cv4(bs->bpb.rdcl)) < LOCLUS) - return EINVAL; + return (EINVAL); } if (!(fs->lsnfat = cv2(bs->bpb.ressec))) - return EINVAL; + return (EINVAL); fs->lsndir = fs->lsnfat + fs->spf * bs->bpb.fats; fs->lsndta = fs->lsndir + entsec(fs->dirents); if (!(sc = cv2(bs->bpb.secs)) && !(sc = cv4(bs->bpb.lsecs))) - return EINVAL; + return (EINVAL); if (fs->lsndta > sc) - return EINVAL; + return (EINVAL); if ((fs->xclus = secblk(fs, sc - fs->lsndta) + 1) < LOCLUS) - return EINVAL; + return (EINVAL); fs->fatsz = fs->dirents ? fs->xclus < 0xff6 ? 12 : 16 : 32; sc = (secbyt(fs->spf) << 1) / (fs->fatsz >> 2) - 1; if (fs->xclus > sc) fs->xclus = sc; - return 0; + return (0); } /* @@ -575,17 +575,17 @@ namede(DOS_FS *fs, const char *path, DOS_DE **dep) if (!(s = strchr(path, '/'))) s = strchr(path, 0); if ((n = s - path) > 255) - return ENAMETOOLONG; + return (ENAMETOOLONG); memcpy(name, path, n); name[n] = 0; path = s; if (!(de->attr & FA_DIR)) - return ENOTDIR; + return (ENOTDIR); if ((err = lookup(fs, stclus(fs->fatsz, de), name, &de))) - return err; + return (err); } *dep = de; - return 0; + return (0); } /* @@ -604,7 +604,7 @@ lookup(DOS_FS *fs, u_int clus, const char *name, DOS_DE **dep) for (ent = 0; ent < 2; ent++) if (!strcasecmp(name, dotstr[ent])) { *dep = dot + ent; - return 0; + return (0); } if (!clus && fs->fatsz == 32) clus = fs->rdcl; @@ -617,13 +617,13 @@ lookup(DOS_FS *fs, u_int clus, const char *name, DOS_DE **dep) else if (okclus(fs, clus)) lsec = blklsn(fs, clus); else - return EINVAL; + return (EINVAL); for (sec = 0; sec < nsec; sec++) { - if ((err = ioget(fs->fd, lsec + sec, 0, dir, secbyt(1)))) - return err; + if ((err = ioget(fs->fd, lsec + sec, dir, secbyt(1)))) + return (err); for (ent = 0; ent < DEPSEC; ent++) { if (!*dir[ent].de.name) - return ENOENT; + return (ENOENT); if (*dir[ent].de.name != 0xe5) { if ((dir[ent].de.attr & FA_MASK) == FA_XDE) { x = dir[ent].xde.seq; @@ -651,7 +651,7 @@ lookup(DOS_FS *fs, u_int clus, const char *name, DOS_DE **dep) } if (ok) { *dep = &dir[ent].de; - return 0; + return (0); } } } @@ -661,11 +661,11 @@ lookup(DOS_FS *fs, u_int clus, const char *name, DOS_DE **dep) if (!clus) break; if ((err = fatget(fs, &clus))) - return err; + return (err); if (fatend(fs->fatsz, clus)) break; } - return ENOENT; + return (ENOENT); } /* @@ -739,11 +739,11 @@ fsize(DOS_FS *fs, DOS_DE *de) size = fs->dirents * sizeof(DOS_DE); else { if ((n = fatcnt(fs, c)) == -1) - return n; + return (n); size = blkbyt(fs, n); } } - return size; + return (size); } /* @@ -756,8 +756,8 @@ fatcnt(DOS_FS *fs, u_int c) for (n = 0; okclus(fs, c); n++) if (fatget(fs, &c)) - return -1; - return fatend(fs->fatsz, c) ? n : -1; + return (-1); + return (fatend(fs->fatsz, c) ? n : -1); } /* @@ -768,8 +768,7 @@ static int fatget(DOS_FS *fs, u_int *c) { u_char buf[4]; - u_char *s; - u_int x, offset, off, n, nbyte, lsec; + u_int x, offset, n, nbyte; struct devdesc *dd = fs->fd->f_devdata; int err = 0; @@ -783,25 +782,9 @@ fatget(DOS_FS *fs, u_int *c) offset = fatoff(fs->fatsz, *c); nbyte = fs->fatsz != 32 ? 2 : 4; - s = buf; - if ((off = offset & (SECSIZ - 1))) { - offset -= off; - lsec = bytsec(offset); - offset += SECSIZ; - if ((n = SECSIZ - off) > nbyte) - n = nbyte; - memcpy(s, fat.buf + secbyt(lsec) + off, n); - s += n; - nbyte -= n; - } - n = nbyte & (SECSIZ - 1); - if (nbyte -= n) { - memcpy(s, fat.buf + secbyt(bytsec(offset)), nbyte); - offset += nbyte; - s += nbyte; - } - if (n) - memcpy(s, fat.buf + secbyt(bytsec(offset)), n); + if (offset + nbyte > secbyt(fat.size)) + return (EINVAL); + memcpy(buf, fat.buf + offset, nbyte); } x = fs->fatsz != 32 ? cv2(buf) : cv4(buf); @@ -815,7 +798,7 @@ fatget(DOS_FS *fs, u_int *c) static int fatend(u_int sz, u_int c) { - return c > (sz == 12 ? 0xff7U : sz == 16 ? 0xfff7U : 0xffffff7); + return (c > (sz == 12 ? 0xff7U : sz == 16 ? 0xfff7U : 0xffffff7)); } /* @@ -827,38 +810,41 @@ ioread(DOS_FS *fs, u_int offset, void *buf, u_int nbyte) char *s; u_int off, n; int err; + u_char local_buf[SECSIZ]; s = buf; if ((off = offset & (SECSIZ - 1))) { offset -= off; if ((n = SECSIZ - off) > nbyte) n = nbyte; - if ((err = ioget(fs->fd, bytsec(offset), off, s, n))) - return err; + if ((err = ioget(fs->fd, bytsec(offset), local_buf, sizeof(local_buf)))) + return (err); + memcpy(s, local_buf + off, n); offset += SECSIZ; s += n; nbyte -= n; } n = nbyte & (SECSIZ - 1); if (nbyte -= n) { - if ((err = ioget(fs->fd, bytsec(offset), 0, s, nbyte))) - return err; + if ((err = ioget(fs->fd, bytsec(offset), s, nbyte))) + return (err); offset += nbyte; s += nbyte; } if (n) { - if ((err = ioget(fs->fd, bytsec(offset), 0, s, n))) - return err; + if ((err = ioget(fs->fd, bytsec(offset), local_buf, sizeof(local_buf)))) + return (err); + memcpy(s, local_buf, n); } - return 0; + return (0); } /* * Sector-based I/O primitive */ static int -ioget(struct open_file *fd, daddr_t lsec, size_t offset, void *buf, u_int size) +ioget(struct open_file *fd, daddr_t lsec, void *buf, u_int size) { - return ((fd->f_dev->dv_strategy)(fd->f_devdata, F_READ, lsec, offset, + return ((fd->f_dev->dv_strategy)(fd->f_devdata, F_READ, lsec, size, buf, NULL)); } diff --git a/usr/src/boot/lib/libstand/read.c b/usr/src/boot/lib/libstand/read.c index 32f7084a8b..aa1f74df60 100644 --- a/usr/src/boot/lib/libstand/read.c +++ b/usr/src/boot/lib/libstand/read.c @@ -79,7 +79,7 @@ read(int fd, void *dest, size_t bcount) if (f->f_flags & F_RAW) { twiddle(8); errno = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, - btodb(f->f_offset), 0, bcount, dest, &resid); + btodb(f->f_offset), bcount, dest, &resid); if (errno) return (-1); f->f_offset += resid; diff --git a/usr/src/boot/lib/libstand/stand.h b/usr/src/boot/lib/libstand/stand.h index 3f193e9c3a..7653242656 100644 --- a/usr/src/boot/lib/libstand/stand.h +++ b/usr/src/boot/lib/libstand/stand.h @@ -139,7 +139,7 @@ struct devsw { int dv_type; /* opaque type constant, arch-dependant */ int (*dv_init)(void); /* early probe call */ int (*dv_strategy)(void *devdata, int rw, daddr_t blk, - size_t offset, size_t size, char *buf, size_t *rsize); + size_t size, char *buf, size_t *rsize); int (*dv_open)(struct open_file *f, ...); int (*dv_close)(struct open_file *f); int (*dv_ioctl)(struct open_file *f, u_long cmd, void *data); diff --git a/usr/src/boot/lib/libstand/ufs.c b/usr/src/boot/lib/libstand/ufs.c index d0a096693d..7d2ff148f4 100644 --- a/usr/src/boot/lib/libstand/ufs.c +++ b/usr/src/boot/lib/libstand/ufs.c @@ -157,7 +157,7 @@ read_inode(inumber, f) buf = malloc(fs->fs_bsize); twiddle(1); rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, - fsbtodb(fs, ino_to_fsba(fs, inumber)), 0, fs->fs_bsize, + fsbtodb(fs, ino_to_fsba(fs, inumber)), fs->fs_bsize, buf, &rsize); if (rc) goto out; @@ -267,7 +267,7 @@ block_map(f, file_block, disk_block_p) malloc(fs->fs_bsize); twiddle(1); rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, - fsbtodb(fp->f_fs, ind_block_num), 0, + fsbtodb(fp->f_fs, ind_block_num), fs->fs_bsize, fp->f_blk[level], &fp->f_blksize[level]); @@ -348,7 +348,7 @@ buf_write_file(f, buf_p, size_p) twiddle(8); rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, - fsbtodb(fs, disk_block), 0, + fsbtodb(fs, disk_block), block_size, fp->f_buf, &fp->f_buf_size); if (rc) return (rc); @@ -367,7 +367,7 @@ buf_write_file(f, buf_p, size_p) twiddle(4); rc = (f->f_dev->dv_strategy)(f->f_devdata, F_WRITE, - fsbtodb(fs, disk_block), 0, + fsbtodb(fs, disk_block), block_size, fp->f_buf, &fp->f_buf_size); return (rc); } @@ -408,7 +408,7 @@ buf_read_file(f, buf_p, size_p) } else { twiddle(4); rc = (f->f_dev->dv_strategy)(f->f_devdata, - F_READ, fsbtodb(fs, disk_block), 0, + F_READ, fsbtodb(fs, disk_block), block_size, fp->f_buf, &fp->f_buf_size); if (rc) return (rc); @@ -516,7 +516,7 @@ ufs_open(upath, f) */ for (i = 0; sblock_try[i] != -1; i++) { rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, - sblock_try[i] / DEV_BSIZE, 0, SBLOCKSIZE, + sblock_try[i] / DEV_BSIZE, SBLOCKSIZE, (char *)fs, &buf_size); if (rc) goto out; @@ -646,7 +646,7 @@ ufs_open(upath, f) twiddle(1); rc = (f->f_dev->dv_strategy)(f->f_devdata, - F_READ, fsbtodb(fs, disk_block), 0, + F_READ, fsbtodb(fs, disk_block), fs->fs_bsize, buf, &buf_size); if (rc) goto out; diff --git a/usr/src/boot/lib/libstand/write.c b/usr/src/boot/lib/libstand/write.c index daf33cfca1..9e02f083f2 100644 --- a/usr/src/boot/lib/libstand/write.c +++ b/usr/src/boot/lib/libstand/write.c @@ -82,7 +82,7 @@ write(fd, dest, bcount) if (f->f_flags & F_RAW) { twiddle(4); errno = (f->f_dev->dv_strategy)(f->f_devdata, F_WRITE, - btodb(f->f_offset), 0, bcount, dest, &resid); + btodb(f->f_offset), bcount, dest, &resid); if (errno) return (-1); f->f_offset += resid; diff --git a/usr/src/boot/sys/boot/arm/at91/bootiic/env_vars.c b/usr/src/boot/sys/boot/arm/at91/bootiic/env_vars.c index f402a43f2a..ac0b4f978f 100644 --- a/usr/src/boot/sys/boot/arm/at91/bootiic/env_vars.c +++ b/usr/src/boot/sys/boot/arm/at91/bootiic/env_vars.c @@ -41,7 +41,7 @@ static int currentOffset; /* * .KB_C_FN_DEFINITION_START * int ReadCharFromEnvironment(char *) - * This private function reads characters from the enviroment variables + * This private function reads characters from the environment variables * to service the command prompt during auto-boot or just to setup the * default environment. Returns positive value if valid character was * set in the pointer. Returns negative value to signal input stream diff --git a/usr/src/boot/sys/boot/arm/at91/bootspi/env_vars.c b/usr/src/boot/sys/boot/arm/at91/bootspi/env_vars.c index 7ab250e5d7..29b819b229 100644 --- a/usr/src/boot/sys/boot/arm/at91/bootspi/env_vars.c +++ b/usr/src/boot/sys/boot/arm/at91/bootspi/env_vars.c @@ -41,7 +41,7 @@ static int currentOffset; /* * .KB_C_FN_DEFINITION_START * int ReadCharFromEnvironment(char *) - * This private function reads characters from the enviroment variables + * This private function reads characters from the environment variables * to service the command prompt during auto-boot or just to setup the * default environment. Returns positive value if valid character was * set in the pointer. Returns negative value to signal input stream diff --git a/usr/src/boot/sys/boot/arm/at91/libat91/at91rm9200.h b/usr/src/boot/sys/boot/arm/at91/libat91/at91rm9200.h index 80d44c8243..c9b9bcc9a0 100644 --- a/usr/src/boot/sys/boot/arm/at91/libat91/at91rm9200.h +++ b/usr/src/boot/sys/boot/arm/at91/libat91/at91rm9200.h @@ -450,51 +450,51 @@ typedef struct _AT91S_ST { AT91_REG ST_CRTR; // Current Real-time Register } AT91S_ST, *AT91PS_ST; -// -------- ST_CR : (ST Offset: 0x0) System Timer Control Register -------- +// -------- ST_CR : (ST Offset: 0x0) System Timer Control Register -------- #define AT91C_ST_WDRST (0x1u << 0) // (ST) Watchdog Timer Restart -// -------- ST_PIMR : (ST Offset: 0x4) System Timer Period Interval Mode Register -------- +// -------- ST_PIMR : (ST Offset: 0x4) System Timer Period Interval Mode Register -------- #define AT91C_ST_PIV (0xFFFFu << 0) // (ST) Watchdog Timer Restart -// -------- ST_WDMR : (ST Offset: 0x8) System Timer Watchdog Mode Register -------- +// -------- ST_WDMR : (ST Offset: 0x8) System Timer Watchdog Mode Register -------- #define AT91C_ST_WDV (0xFFFFu << 0) // (ST) Watchdog Timer Restart #define AT91C_ST_RSTEN (0x1u << 16) // (ST) Reset Enable #define AT91C_ST_EXTEN (0x1u << 17) // (ST) External Signal Assertion Enable -// -------- ST_RTMR : (ST Offset: 0xc) System Timer Real-time Mode Register -------- +// -------- ST_RTMR : (ST Offset: 0xc) System Timer Real-time Mode Register -------- #define AT91C_ST_RTPRES (0xFFFFu << 0) // (ST) Real-time Timer Prescaler Value -// -------- ST_SR : (ST Offset: 0x10) System Timer Status Register -------- +// -------- ST_SR : (ST Offset: 0x10) System Timer Status Register -------- #define AT91C_ST_PITS (0x1u << 0) // (ST) Period Interval Timer Interrupt #define AT91C_ST_WDOVF (0x1u << 1) // (ST) Watchdog Overflow #define AT91C_ST_RTTINC (0x1u << 2) // (ST) Real-time Timer Increment #define AT91C_ST_ALMS (0x1u << 3) // (ST) Alarm Status -// -------- ST_IER : (ST Offset: 0x14) System Timer Interrupt Enable Register -------- -// -------- ST_IDR : (ST Offset: 0x18) System Timer Interrupt Disable Register -------- -// -------- ST_IMR : (ST Offset: 0x1c) System Timer Interrupt Mask Register -------- -// -------- ST_RTAR : (ST Offset: 0x20) System Timer Real-time Alarm Register -------- +// -------- ST_IER : (ST Offset: 0x14) System Timer Interrupt Enable Register -------- +// -------- ST_IDR : (ST Offset: 0x18) System Timer Interrupt Disable Register -------- +// -------- ST_IMR : (ST Offset: 0x1c) System Timer Interrupt Mask Register -------- +// -------- ST_RTAR : (ST Offset: 0x20) System Timer Real-time Alarm Register -------- #define AT91C_ST_ALMV (0xFFFFFu << 0) // (ST) Alarm Value Value -// -------- ST_CRTR : (ST Offset: 0x24) System Timer Current Real-time Register -------- +// -------- ST_CRTR : (ST Offset: 0x24) System Timer Current Real-time Register -------- #define AT91C_ST_CRTV (0xFFFFFu << 0) // (ST) Current Real-time Value // ***************************************************************************** -// SOFTWARE API DEFINITION FOR Power Management Controler +// SOFTWARE API DEFINITION FOR Power Management Controller // ***************************************************************************** typedef struct _AT91S_PMC { - AT91_REG PMC_SCER; // System Clock Enable Register - AT91_REG PMC_SCDR; // System Clock Disable Register - AT91_REG PMC_SCSR; // System Clock Status Register - AT91_REG Reserved0[1]; // - AT91_REG PMC_PCER; // Peripheral Clock Enable Register - AT91_REG PMC_PCDR; // Peripheral Clock Disable Register - AT91_REG PMC_PCSR; // Peripheral Clock Status Register - AT91_REG Reserved1[5]; // - AT91_REG PMC_MCKR; // Master Clock Register - AT91_REG Reserved2[3]; // - AT91_REG PMC_PCKR[8]; // Programmable Clock Register - AT91_REG PMC_IER; // Interrupt Enable Register - AT91_REG PMC_IDR; // Interrupt Disable Register - AT91_REG PMC_SR; // Status Register - AT91_REG PMC_IMR; // Interrupt Mask Register + AT91_REG PMC_SCER; // System Clock Enable Register + AT91_REG PMC_SCDR; // System Clock Disable Register + AT91_REG PMC_SCSR; // System Clock Status Register + AT91_REG Reserved0[1]; // + AT91_REG PMC_PCER; // Peripheral Clock Enable Register + AT91_REG PMC_PCDR; // Peripheral Clock Disable Register + AT91_REG PMC_PCSR; // Peripheral Clock Status Register + AT91_REG Reserved1[5]; // + AT91_REG PMC_MCKR; // Master Clock Register + AT91_REG Reserved2[3]; // + AT91_REG PMC_PCKR[8]; // Programmable Clock Register + AT91_REG PMC_IER; // Interrupt Enable Register + AT91_REG PMC_IDR; // Interrupt Disable Register + AT91_REG PMC_SR; // Status Register + AT91_REG PMC_IMR; // Interrupt Mask Register } AT91S_PMC, *AT91PS_PMC; -// -------- PMC_SCER : (PMC Offset: 0x0) System Clock Enable Register -------- +// -------- PMC_SCER : (PMC Offset: 0x0) System Clock Enable Register -------- #define AT91C_PMC_PCK (0x1u << 0) // (PMC) Processor Clock #define AT91C_PMC_UDP (0x1u << 1) // (PMC) USB Device Port Clock #define AT91C_PMC_MCKUDP (0x1u << 2) // (PMC) USB Device Port Master Clock Automatic Disable on Suspend @@ -507,9 +507,9 @@ typedef struct _AT91S_PMC { #define AT91C_PMC_PCK5 (0x1u << 13) // (PMC) Programmable Clock Output #define AT91C_PMC_PCK6 (0x1u << 14) // (PMC) Programmable Clock Output #define AT91C_PMC_PCK7 (0x1u << 15) // (PMC) Programmable Clock Output -// -------- PMC_SCDR : (PMC Offset: 0x4) System Clock Disable Register -------- -// -------- PMC_SCSR : (PMC Offset: 0x8) System Clock Status Register -------- -// -------- PMC_MCKR : (PMC Offset: 0x30) Master Clock Register -------- +// -------- PMC_SCDR : (PMC Offset: 0x4) System Clock Disable Register -------- +// -------- PMC_SCSR : (PMC Offset: 0x8) System Clock Status Register -------- +// -------- PMC_MCKR : (PMC Offset: 0x30) Master Clock Register -------- #define AT91C_PMC_CSS (0x3u << 0) // (PMC) Programmable Clock Selection #define AT91C_PMC_CSS_SLOW_CLK 0x0u // (PMC) Slow Clock is selected #define AT91C_PMC_CSS_MAIN_CLK 0x1u // (PMC) Main Clock is selected @@ -528,8 +528,8 @@ typedef struct _AT91S_PMC { #define AT91C_PMC_MDIV_2 (0x1u << 8) // (PMC) The processor clock is twice as fast as the master clock #define AT91C_PMC_MDIV_3 (0x2u << 8) // (PMC) The processor clock is three times faster than the master clock #define AT91C_PMC_MDIV_4 (0x3u << 8) // (PMC) The processor clock is four times faster than the master clock -// -------- PMC_PCKR : (PMC Offset: 0x40) Programmable Clock Register -------- -// -------- PMC_IER : (PMC Offset: 0x60) PMC Interrupt Enable Register -------- +// -------- PMC_PCKR : (PMC Offset: 0x40) Programmable Clock Register -------- +// -------- PMC_IER : (PMC Offset: 0x60) PMC Interrupt Enable Register -------- #define AT91C_PMC_MOSCS (0x1u << 0) // (PMC) MOSC Status/Enable/Disable/Mask #define AT91C_PMC_LOCKA (0x1u << 1) // (PMC) PLL A Status/Enable/Disable/Mask #define AT91C_PMC_LOCKB (0x1u << 2) // (PMC) PLL B Status/Enable/Disable/Mask @@ -542,28 +542,28 @@ typedef struct _AT91S_PMC { #define AT91C_PMC_PCK5RDY (0x1u << 13) // (PMC) PCK5_RDY Status/Enable/Disable/Mask #define AT91C_PMC_PCK6RDY (0x1u << 14) // (PMC) PCK6_RDY Status/Enable/Disable/Mask #define AT91C_PMC_PCK7RDY (0x1u << 15) // (PMC) PCK7_RDY Status/Enable/Disable/Mask -// -------- PMC_IDR : (PMC Offset: 0x64) PMC Interrupt Disable Register -------- -// -------- PMC_SR : (PMC Offset: 0x68) PMC Status Register -------- -// -------- PMC_IMR : (PMC Offset: 0x6c) PMC Interrupt Mask Register -------- +// -------- PMC_IDR : (PMC Offset: 0x64) PMC Interrupt Disable Register -------- +// -------- PMC_SR : (PMC Offset: 0x68) PMC Status Register -------- +// -------- PMC_IMR : (PMC Offset: 0x6c) PMC Interrupt Mask Register -------- // ***************************************************************************** -// SOFTWARE API DEFINITION FOR Clock Generator Controler +// SOFTWARE API DEFINITION FOR Clock Generator Controller // ***************************************************************************** typedef struct _AT91S_CKGR { - AT91_REG CKGR_MOR; // Main Oscillator Register - AT91_REG CKGR_MCFR; // Main Clock Frequency Register - AT91_REG CKGR_PLLAR; // PLL A Register - AT91_REG CKGR_PLLBR; // PLL B Register + AT91_REG CKGR_MOR; // Main Oscillator Register + AT91_REG CKGR_MCFR; // Main Clock Frequency Register + AT91_REG CKGR_PLLAR; // PLL A Register + AT91_REG CKGR_PLLBR; // PLL B Register } AT91S_CKGR, *AT91PS_CKGR; -// -------- CKGR_MOR : (CKGR Offset: 0x0) Main Oscillator Register -------- +// -------- CKGR_MOR : (CKGR Offset: 0x0) Main Oscillator Register -------- #define AT91C_CKGR_MOSCEN (0x1u << 0) // (CKGR) Main Oscillator Enable #define AT91C_CKGR_OSCTEST (0x1u << 1) // (CKGR) Oscillator Test #define AT91C_CKGR_OSCOUNT (0xFFu << 8) // (CKGR) Main Oscillator Start-up Time -// -------- CKGR_MCFR : (CKGR Offset: 0x4) Main Clock Frequency Register -------- +// -------- CKGR_MCFR : (CKGR Offset: 0x4) Main Clock Frequency Register -------- #define AT91C_CKGR_MAINF (0xFFFFu << 0) // (CKGR) Main Clock Frequency #define AT91C_CKGR_MAINRDY (0x1u << 16) // (CKGR) Main Clock Ready -// -------- CKGR_PLLAR : (CKGR Offset: 0x8) PLL A Register -------- +// -------- CKGR_PLLAR : (CKGR Offset: 0x8) PLL A Register -------- #define AT91C_CKGR_DIVA (0xFFu << 0) // (CKGR) Divider Selected #define AT91C_CKGR_DIVA_0 0x0u // (CKGR) Divider output is 0 #define AT91C_CKGR_DIVA_BYPASS 0x1u // (CKGR) Divider is bypassed @@ -575,7 +575,7 @@ typedef struct _AT91S_CKGR { #define AT91C_CKGR_OUTA_3 (0x3u << 14) // (CKGR) Please refer to the PLLA datasheet #define AT91C_CKGR_MULA (0x7FFu << 16) // (CKGR) PLL A Multiplier #define AT91C_CKGR_SRCA (0x1u << 29) // (CKGR) PLL A Source -// -------- CKGR_PLLBR : (CKGR Offset: 0xc) PLL B Register -------- +// -------- CKGR_PLLBR : (CKGR Offset: 0xc) PLL B Register -------- #define AT91C_CKGR_DIVB (0xFFu << 0) // (CKGR) Divider Selected #define AT91C_CKGR_DIVB_0 0x0u // (CKGR) Divider output is 0 #define AT91C_CKGR_DIVB_BYPASS 0x1u // (CKGR) Divider is bypassed @@ -590,44 +590,44 @@ typedef struct _AT91S_CKGR { #define AT91C_CKGR_USB_PLL (0x1u << 29) // (CKGR) PLL Use // ***************************************************************************** -// SOFTWARE API DEFINITION FOR Parallel Input Output Controler +// SOFTWARE API DEFINITION FOR Parallel Input Output Controller // ***************************************************************************** typedef struct _AT91S_PIO { - AT91_REG PIO_PER; // PIO Enable Register - AT91_REG PIO_PDR; // PIO Disable Register - AT91_REG PIO_PSR; // PIO Status Register - AT91_REG Reserved0[1]; // - AT91_REG PIO_OER; // Output Enable Register - AT91_REG PIO_ODR; // Output Disable Registerr - AT91_REG PIO_OSR; // Output Status Register - AT91_REG Reserved1[1]; // - AT91_REG PIO_IFER; // Input Filter Enable Register - AT91_REG PIO_IFDR; // Input Filter Disable Register - AT91_REG PIO_IFSR; // Input Filter Status Register - AT91_REG Reserved2[1]; // - AT91_REG PIO_SODR; // Set Output Data Register - AT91_REG PIO_CODR; // Clear Output Data Register - AT91_REG PIO_ODSR; // Output Data Status Register - AT91_REG PIO_PDSR; // Pin Data Status Register - AT91_REG PIO_IER; // Interrupt Enable Register - AT91_REG PIO_IDR; // Interrupt Disable Register - AT91_REG PIO_IMR; // Interrupt Mask Register - AT91_REG PIO_ISR; // Interrupt Status Register - AT91_REG PIO_MDER; // Multi-driver Enable Register - AT91_REG PIO_MDDR; // Multi-driver Disable Register - AT91_REG PIO_MDSR; // Multi-driver Status Register - AT91_REG Reserved3[1]; // - AT91_REG PIO_PPUDR; // Pull-up Disable Register - AT91_REG PIO_PPUER; // Pull-up Enable Register - AT91_REG PIO_PPUSR; // Pad Pull-up Status Register - AT91_REG Reserved4[1]; // - AT91_REG PIO_ASR; // Select A Register - AT91_REG PIO_BSR; // Select B Register - AT91_REG PIO_ABSR; // AB Select Status Register - AT91_REG Reserved5[9]; // - AT91_REG PIO_OWER; // Output Write Enable Register - AT91_REG PIO_OWDR; // Output Write Disable Register - AT91_REG PIO_OWSR; // Output Write Status Register + AT91_REG PIO_PER; // PIO Enable Register + AT91_REG PIO_PDR; // PIO Disable Register + AT91_REG PIO_PSR; // PIO Status Register + AT91_REG Reserved0[1]; // + AT91_REG PIO_OER; // Output Enable Register + AT91_REG PIO_ODR; // Output Disable Registerr + AT91_REG PIO_OSR; // Output Status Register + AT91_REG Reserved1[1]; // + AT91_REG PIO_IFER; // Input Filter Enable Register + AT91_REG PIO_IFDR; // Input Filter Disable Register + AT91_REG PIO_IFSR; // Input Filter Status Register + AT91_REG Reserved2[1]; // + AT91_REG PIO_SODR; // Set Output Data Register + AT91_REG PIO_CODR; // Clear Output Data Register + AT91_REG PIO_ODSR; // Output Data Status Register + AT91_REG PIO_PDSR; // Pin Data Status Register + AT91_REG PIO_IER; // Interrupt Enable Register + AT91_REG PIO_IDR; // Interrupt Disable Register + AT91_REG PIO_IMR; // Interrupt Mask Register + AT91_REG PIO_ISR; // Interrupt Status Register + AT91_REG PIO_MDER; // Multi-driver Enable Register + AT91_REG PIO_MDDR; // Multi-driver Disable Register + AT91_REG PIO_MDSR; // Multi-driver Status Register + AT91_REG Reserved3[1]; // + AT91_REG PIO_PPUDR; // Pull-up Disable Register + AT91_REG PIO_PPUER; // Pull-up Enable Register + AT91_REG PIO_PPUSR; // Pad Pull-up Status Register + AT91_REG Reserved4[1]; // + AT91_REG PIO_ASR; // Select A Register + AT91_REG PIO_BSR; // Select B Register + AT91_REG PIO_ABSR; // AB Select Status Register + AT91_REG Reserved5[9]; // + AT91_REG PIO_OWER; // Output Write Enable Register + AT91_REG PIO_OWDR; // Output Write Disable Register + AT91_REG PIO_OWSR; // Output Write Status Register } AT91S_PIO, *AT91PS_PIO; @@ -635,30 +635,30 @@ typedef struct _AT91S_PIO { // SOFTWARE API DEFINITION FOR Debug Unit // ***************************************************************************** typedef struct _AT91S_DBGU { - AT91_REG DBGU_CR; // Control Register - AT91_REG DBGU_MR; // Mode Register - AT91_REG DBGU_IER; // Interrupt Enable Register - AT91_REG DBGU_IDR; // Interrupt Disable Register - AT91_REG DBGU_IMR; // Interrupt Mask Register - AT91_REG DBGU_CSR; // Channel Status Register - AT91_REG DBGU_RHR; // Receiver Holding Register - AT91_REG DBGU_THR; // Transmitter Holding Register - AT91_REG DBGU_BRGR; // Baud Rate Generator Register - AT91_REG Reserved0[7]; // - AT91_REG DBGU_C1R; // Chip ID1 Register - AT91_REG DBGU_C2R; // Chip ID2 Register - AT91_REG DBGU_FNTR; // Force NTRST Register - AT91_REG Reserved1[45]; // - AT91_REG DBGU_RPR; // Receive Pointer Register - AT91_REG DBGU_RCR; // Receive Counter Register - AT91_REG DBGU_TPR; // Transmit Pointer Register - AT91_REG DBGU_TCR; // Transmit Counter Register - AT91_REG DBGU_RNPR; // Receive Next Pointer Register - AT91_REG DBGU_RNCR; // Receive Next Counter Register - AT91_REG DBGU_TNPR; // Transmit Next Pointer Register - AT91_REG DBGU_TNCR; // Transmit Next Counter Register - AT91_REG DBGU_PTCR; // PDC Transfer Control Register - AT91_REG DBGU_PTSR; // PDC Transfer Status Register + AT91_REG DBGU_CR; // Control Register + AT91_REG DBGU_MR; // Mode Register + AT91_REG DBGU_IER; // Interrupt Enable Register + AT91_REG DBGU_IDR; // Interrupt Disable Register + AT91_REG DBGU_IMR; // Interrupt Mask Register + AT91_REG DBGU_CSR; // Channel Status Register + AT91_REG DBGU_RHR; // Receiver Holding Register + AT91_REG DBGU_THR; // Transmitter Holding Register + AT91_REG DBGU_BRGR; // Baud Rate Generator Register + AT91_REG Reserved0[7]; // + AT91_REG DBGU_C1R; // Chip ID1 Register + AT91_REG DBGU_C2R; // Chip ID2 Register + AT91_REG DBGU_FNTR; // Force NTRST Register + AT91_REG Reserved1[45]; // + AT91_REG DBGU_RPR; // Receive Pointer Register + AT91_REG DBGU_RCR; // Receive Counter Register + AT91_REG DBGU_TPR; // Transmit Pointer Register + AT91_REG DBGU_TCR; // Transmit Counter Register + AT91_REG DBGU_RNPR; // Receive Next Pointer Register + AT91_REG DBGU_RNCR; // Receive Next Counter Register + AT91_REG DBGU_TNPR; // Transmit Next Pointer Register + AT91_REG DBGU_TNCR; // Transmit Next Counter Register + AT91_REG DBGU_PTCR; // PDC Transfer Control Register + AT91_REG DBGU_PTSR; // PDC Transfer Status Register } AT91S_DBGU, *AT91PS_DBGU; // -------- DBGU_CR : (DBGU Offset: 0x0) Debug Unit Control Register -------- diff --git a/usr/src/boot/sys/boot/arm/at91/libat91/mci_device.h b/usr/src/boot/sys/boot/arm/at91/libat91/mci_device.h index c2b75ad70b..27e5d36223 100644 --- a/usr/src/boot/sys/boot/arm/at91/libat91/mci_device.h +++ b/usr/src/boot/sys/boot/arm/at91/libat91/mci_device.h @@ -106,15 +106,15 @@ typedef struct _AT91S_MciDevice /////////////////////////////////////////////////////////////////////////////// #define AT91C_CMD_SEND_OK 0 // Command ok #define AT91C_CMD_SEND_ERROR -1 // Command failed -#define AT91C_INIT_OK 2 // Init Successfull +#define AT91C_INIT_OK 2 // Init Successful #define AT91C_INIT_ERROR 3 // Init Failed -#define AT91C_READ_OK 4 // Read Successfull +#define AT91C_READ_OK 4 // Read Successful #define AT91C_READ_ERROR 5 // Read Failed -#define AT91C_WRITE_OK 6 // Write Successfull +#define AT91C_WRITE_OK 6 // Write Successful #define AT91C_WRITE_ERROR 7 // Write Failed -#define AT91C_ERASE_OK 8 // Erase Successfull +#define AT91C_ERASE_OK 8 // Erase Successful #define AT91C_ERASE_ERROR 9 // Erase Failed -#define AT91C_CARD_SELECTED_OK 10 // Card Selection Successfull +#define AT91C_CARD_SELECTED_OK 10 // Card Selection Successful #define AT91C_CARD_SELECTED_ERROR 11 // Card Selection Failed #define AT91C_MCI_SR_ERROR (AT91C_MCI_UNRE | AT91C_MCI_OVRE | AT91C_MCI_DTOE | \ diff --git a/usr/src/boot/sys/boot/common/bcache.c b/usr/src/boot/sys/boot/common/bcache.c index 3ac38d9b18..4c155625be 100644 --- a/usr/src/boot/sys/boot/common/bcache.c +++ b/usr/src/boot/sys/boot/common/bcache.c @@ -182,8 +182,8 @@ bcache_free(void *cache) * cache with the new values. */ static int -write_strategy(void *devdata, int rw, daddr_t blk, size_t offset, - size_t size, char *buf, size_t *rsize) +write_strategy(void *devdata, int rw, daddr_t blk, size_t size, + char *buf, size_t *rsize) { struct bcache_devdata *dd = (struct bcache_devdata *)devdata; struct bcache *bc = dd->dv_cache; @@ -197,7 +197,7 @@ write_strategy(void *devdata, int rw, daddr_t blk, size_t offset, } /* Write the blocks */ - return (dd->dv_strategy(dd->dv_devdata, rw, blk, offset, size, buf, rsize)); + return (dd->dv_strategy(dd->dv_devdata, rw, blk, size, buf, rsize)); } /* @@ -206,8 +206,8 @@ write_strategy(void *devdata, int rw, daddr_t blk, size_t offset, * device I/O and then use the I/O results to populate the cache. */ static int -read_strategy(void *devdata, int rw, daddr_t blk, size_t offset, - size_t size, char *buf, size_t *rsize) +read_strategy(void *devdata, int rw, daddr_t blk, size_t size, + char *buf, size_t *rsize) { struct bcache_devdata *dd = (struct bcache_devdata *)devdata; struct bcache *bc = dd->dv_cache; @@ -225,7 +225,7 @@ read_strategy(void *devdata, int rw, daddr_t blk, size_t offset, *rsize = 0; nblk = size / bcache_blksize; - if ((nblk == 0 && size != 0) || offset != 0) + if (nblk == 0 && size != 0) nblk++; result = 0; complete = 1; @@ -246,8 +246,7 @@ read_strategy(void *devdata, int rw, daddr_t blk, size_t offset, if (complete) { /* whole set was in cache, return it */ if (bc->ra < BCACHE_READAHEAD) bc->ra <<= 1; /* increase read ahead */ - bcopy(bc->bcache_data + (bcache_blksize * BHASH(bc, blk)) + offset, - buf, size); + bcopy(bc->bcache_data + (bcache_blksize * BHASH(bc, blk)), buf, size); goto done; } @@ -282,7 +281,7 @@ read_strategy(void *devdata, int rw, daddr_t blk, size_t offset, * in either case we should return the data in bcache and only * return error if there is no data. */ - result = dd->dv_strategy(dd->dv_devdata, rw, p_blk, 0, + result = dd->dv_strategy(dd->dv_devdata, rw, p_blk, p_size * bcache_blksize, p_buf, &r_size); r_size /= bcache_blksize; @@ -307,8 +306,7 @@ read_strategy(void *devdata, int rw, daddr_t blk, size_t offset, size = i * bcache_blksize; if (size != 0) { - bcopy(bc->bcache_data + (bcache_blksize * BHASH(bc, blk)) + offset, - buf, size); + bcopy(bc->bcache_data + (bcache_blksize * BHASH(bc, blk)), buf, size); result = 0; } @@ -323,8 +321,8 @@ read_strategy(void *devdata, int rw, daddr_t blk, size_t offset, * directly to the disk. XXX tune this. */ int -bcache_strategy(void *devdata, int rw, daddr_t blk, size_t offset, - size_t size, char *buf, size_t *rsize) +bcache_strategy(void *devdata, int rw, daddr_t blk, size_t size, + char *buf, size_t *rsize) { struct bcache_devdata *dd = (struct bcache_devdata *)devdata; struct bcache *bc = dd->dv_cache; @@ -339,23 +337,16 @@ bcache_strategy(void *devdata, int rw, daddr_t blk, size_t offset, /* bypass large requests, or when the cache is inactive */ if (bc == NULL || - (offset == 0 && ((size * 2 / bcache_blksize) > bcache_nblks))) { + ((size * 2 / bcache_blksize) > bcache_nblks)) { DEBUG("bypass %d from %d", size / bcache_blksize, blk); bcache_bypasses++; - return (dd->dv_strategy(dd->dv_devdata, rw, blk, offset, size, buf, - rsize)); - } - - /* normalize offset */ - while (offset >= bcache_blksize) { - blk++; - offset -= bcache_blksize; + return (dd->dv_strategy(dd->dv_devdata, rw, blk, size, buf, rsize)); } switch (rw) { case F_READ: nblk = size / bcache_blksize; - if (offset || (size != 0 && nblk == 0)) + if (size != 0 && nblk == 0) nblk++; /* read at least one block */ ret = 0; @@ -366,14 +357,10 @@ bcache_strategy(void *devdata, int rw, daddr_t blk, size_t offset, if (size <= bcache_blksize) csize = size; - else { + else csize = cblk * bcache_blksize; - if (offset) - csize -= (bcache_blksize - offset); - } - ret = read_strategy(devdata, rw, blk, offset, - csize, buf+total, &isize); + ret = read_strategy(devdata, rw, blk, csize, buf+total, &isize); /* * we may have error from read ahead, if we have read some data @@ -384,8 +371,7 @@ bcache_strategy(void *devdata, int rw, daddr_t blk, size_t offset, ret = 0; break; } - blk += (offset+isize) / bcache_blksize; - offset = 0; + blk += isize / bcache_blksize; total += isize; size -= isize; nblk = size / bcache_blksize; @@ -396,7 +382,7 @@ bcache_strategy(void *devdata, int rw, daddr_t blk, size_t offset, return (ret); case F_WRITE: - return write_strategy(devdata, rw, blk, offset, size, buf, rsize); + return write_strategy(devdata, rw, blk, size, buf, rsize); } return -1; } diff --git a/usr/src/boot/sys/boot/common/bootstrap.h b/usr/src/boot/sys/boot/common/bootstrap.h index 9539180cb3..fb2201f5d4 100644 --- a/usr/src/boot/sys/boot/common/bootstrap.h +++ b/usr/src/boot/sys/boot/common/bootstrap.h @@ -78,7 +78,7 @@ void bcache_add_dev(int); void *bcache_allocate(void); void bcache_free(void *); int bcache_strategy(void *devdata, int rw, daddr_t blk, - size_t offset, size_t size, char *buf, size_t *rsize); + size_t size, char *buf, size_t *rsize); /* * Disk block cache @@ -86,7 +86,7 @@ int bcache_strategy(void *devdata, int rw, daddr_t blk, struct bcache_devdata { int (*dv_strategy)(void *devdata, int rw, daddr_t blk, - size_t offset, size_t size, char *buf, size_t *rsize); + size_t size, char *buf, size_t *rsize); void *dv_devdata; void *dv_cache; }; diff --git a/usr/src/boot/sys/boot/common/disk.c b/usr/src/boot/sys/boot/common/disk.c index c7eab49fe9..bad0a700c4 100644 --- a/usr/src/boot/sys/boot/common/disk.c +++ b/usr/src/boot/sys/boot/common/disk.c @@ -178,7 +178,7 @@ ptblread(void *d, void *buf, size_t blocks, uint64_t offset) dev = (struct disk_devdesc *)d; od = (struct open_disk *)dev->d_opendata; - return (dev->d_dev->dv_strategy(dev, F_READ, offset, 0, + return (dev->d_dev->dv_strategy(dev, F_READ, offset, blocks * od->sectorsize, (char *)buf, NULL)); } @@ -243,7 +243,7 @@ disk_read(struct disk_devdesc *dev, void *buf, uint64_t offset, u_int blocks) int ret; od = (struct open_disk *)dev->d_opendata; - ret = dev->d_dev->dv_strategy(dev, F_READ, dev->d_offset + offset, 0, + ret = dev->d_dev->dv_strategy(dev, F_READ, dev->d_offset + offset, blocks * od->sectorsize, buf, NULL); return (ret); @@ -256,7 +256,7 @@ disk_write(struct disk_devdesc *dev, void *buf, uint64_t offset, u_int blocks) int ret; od = (struct open_disk *)dev->d_opendata; - ret = dev->d_dev->dv_strategy(dev, F_WRITE, dev->d_offset + offset, 0, + ret = dev->d_dev->dv_strategy(dev, F_WRITE, dev->d_offset + offset, blocks * od->sectorsize, buf, NULL); return (ret); diff --git a/usr/src/boot/sys/boot/common/part.c b/usr/src/boot/sys/boot/common/part.c index f2b3fc644d..800641bd86 100644 --- a/usr/src/boot/sys/boot/common/part.c +++ b/usr/src/boot/sys/boot/common/part.c @@ -119,7 +119,7 @@ parttype2str(enum partition_type type) { size_t i; - for (i = 0; i < sizeof(ptypes) / sizeof(ptypes[0]); i++) + for (i = 0; i < nitems(ptypes); i++) if (ptypes[i].type == type) return (ptypes[i].desc); return (ptypes[0].desc); diff --git a/usr/src/boot/sys/boot/efi/boot1/boot1.c b/usr/src/boot/sys/boot/efi/boot1/boot1.c index 7692f52e68..7d92f2a765 100644 --- a/usr/src/boot/sys/boot/efi/boot1/boot1.c +++ b/usr/src/boot/sys/boot/efi/boot1/boot1.c @@ -108,8 +108,8 @@ nodes_match(EFI_DEVICE_PATH *imgpath, EFI_DEVICE_PATH *devpath) /* * device_paths_match returns TRUE if the imgpath isn't NULL and all nodes - * in imgpath and devpath match up to their respect occurances of a media - * node, FALSE otherwise. + * in imgpath and devpath match up to their respective occurences of a + * media node, FALSE otherwise. */ static BOOLEAN device_paths_match(EFI_DEVICE_PATH *imgpath, EFI_DEVICE_PATH *devpath) diff --git a/usr/src/boot/sys/boot/efi/include/amd64/efibind.h b/usr/src/boot/sys/boot/efi/include/amd64/efibind.h index e871085d39..6b0465b627 100644 --- a/usr/src/boot/sys/boot/efi/include/amd64/efibind.h +++ b/usr/src/boot/sys/boot/efi/include/amd64/efibind.h @@ -232,12 +232,12 @@ typedef uint64_t UINTN; #define LOAD_INTERNAL_DRIVER(_if, type, name, entry) \ - (_if)->LoadInternal(type, name, NULL) + (_if)->LoadInternal(type, name, NULL) -#else // EFI_NT_EMULATOR +#else // EFI_NT_EMULATOR // -// When build similiar to FW, then link everything together as +// When building similar to FW, link everything together as // one big module. // diff --git a/usr/src/boot/sys/boot/efi/include/arm/efibind.h b/usr/src/boot/sys/boot/efi/include/arm/efibind.h index 85537ad376..177032adc0 100644 --- a/usr/src/boot/sys/boot/efi/include/arm/efibind.h +++ b/usr/src/boot/sys/boot/efi/include/arm/efibind.h @@ -34,7 +34,7 @@ Abstract: // -// Make sure we are useing the correct packing rules per EFI specification +// Make sure we are using the correct packing rules per EFI specification // #ifndef __GNUC__ #pragma pack() diff --git a/usr/src/boot/sys/boot/efi/include/arm64/efibind.h b/usr/src/boot/sys/boot/efi/include/arm64/efibind.h index 142f16267c..8581643b98 100644 --- a/usr/src/boot/sys/boot/efi/include/arm64/efibind.h +++ b/usr/src/boot/sys/boot/efi/include/arm64/efibind.h @@ -176,9 +176,9 @@ typedef uint64_t UINTN; #define VOLATILE volatile // -// BugBug: Need to find out if this is portable accross compliers. +// BugBug: Need to find out if this is portable across compilers. // -void __mfa (void); +void __mfa (void); #define MEMORY_FENCE() __mfa() #ifdef EFI_NO_INTERFACE_DECL @@ -190,7 +190,7 @@ void __mfa (void); #endif // -// When build similiar to FW, then link everything together as +// When building similar to FW, link everything together as // one big module. // diff --git a/usr/src/boot/sys/boot/efi/include/efiuga.h b/usr/src/boot/sys/boot/efi/include/efiuga.h index 6dfaf500b2..dce4e044c1 100644 --- a/usr/src/boot/sys/boot/efi/include/efiuga.h +++ b/usr/src/boot/sys/boot/efi/include/efiuga.h @@ -136,10 +136,10 @@ typedef enum { @param[in] Width - Width of rectangle in BltBuffer in pixels. @param[in] Height - Hight of rectangle in BltBuffer in pixels. @param[in] Delta - OPTIONAL - + @retval EFI_SUCCESS - The Blt operation completed. @retval EFI_INVALID_PARAMETER - BltOperation is not valid. - @retval EFI_DEVICE_ERROR - A hardware error occured writting to the video buffer. + @retval EFI_DEVICE_ERROR - A hardware error occurred writing to the video buffer. --*/ typedef diff --git a/usr/src/boot/sys/boot/efi/include/i386/efibind.h b/usr/src/boot/sys/boot/efi/include/i386/efibind.h index 6e5a7163a9..fee8d3a92c 100644 --- a/usr/src/boot/sys/boot/efi/include/i386/efibind.h +++ b/usr/src/boot/sys/boot/efi/include/i386/efibind.h @@ -229,12 +229,12 @@ typedef uint32_t UINTN; #define LOAD_INTERNAL_DRIVER(_if, type, name, entry) \ - (_if)->LoadInternal(type, name, NULL) + (_if)->LoadInternal(type, name, NULL) -#else // EFI_NT_EMULATOR +#else // EFI_NT_EMULATOR // -// When build similiar to FW, then link everything together as +// When building similar to FW, link everything together as // one big module. // diff --git a/usr/src/boot/sys/boot/efi/libefi/efipart.c b/usr/src/boot/sys/boot/efi/libefi/efipart.c index 9ba52bb626..56cba4af47 100644 --- a/usr/src/boot/sys/boot/efi/libefi/efipart.c +++ b/usr/src/boot/sys/boot/efi/libefi/efipart.c @@ -42,10 +42,8 @@ static EFI_GUID blkio_guid = BLOCK_IO_PROTOCOL; static EFI_GUID devpath_guid = DEVICE_PATH_PROTOCOL; static int efipart_init(void); -static int efipart_strategy(void *, int, daddr_t, size_t, size_t, char *, - size_t *); -static int efipart_realstrategy(void *, int, daddr_t, size_t, size_t, char *, - size_t *); +static int efipart_strategy(void *, int, daddr_t, size_t, char *, size_t *); +static int efipart_realstrategy(void *, int, daddr_t, size_t, char *, size_t *); static int efipart_open(struct open_file *, ...); static int efipart_close(struct open_file *); static int efipart_print(int); @@ -296,8 +294,8 @@ efipart_readwrite(EFI_BLOCK_IO *blkio, int rw, daddr_t blk, daddr_t nblks, } static int -efipart_strategy(void *devdata, int rw, daddr_t blk, size_t offset, - size_t size, char *buf, size_t *rsize) +efipart_strategy(void *devdata, int rw, daddr_t blk, size_t size, + char *buf, size_t *rsize) { struct bcache_devdata bcd; struct devdesc *dev; @@ -306,13 +304,12 @@ efipart_strategy(void *devdata, int rw, daddr_t blk, size_t offset, bcd.dv_strategy = efipart_realstrategy; bcd.dv_devdata = devdata; bcd.dv_cache = PD(dev).pd_bcache; - return (bcache_strategy(&bcd, rw, blk, offset, size, - buf, rsize)); + return (bcache_strategy(&bcd, rw, blk, size, buf, rsize)); } static int -efipart_realstrategy(void *devdata, int rw, daddr_t blk, size_t offset, - size_t size, char *buf, size_t *rsize) +efipart_realstrategy(void *devdata, int rw, daddr_t blk, size_t size, + char *buf, size_t *rsize) { struct devdesc *dev = (struct devdesc *)devdata; EFI_BLOCK_IO *blkio; diff --git a/usr/src/boot/sys/boot/efi/loader/bootinfo.c b/usr/src/boot/sys/boot/efi/loader/bootinfo.c index c6a76abc08..1f45ea3493 100644 --- a/usr/src/boot/sys/boot/efi/loader/bootinfo.c +++ b/usr/src/boot/sys/boot/efi/loader/bootinfo.c @@ -445,7 +445,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp) /* Do relocation fixup on metadata of each module. */ for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) { - for (i = 0; i < sizeof mdt / sizeof mdt[0]; i++) { + for (i = 0; i < nitems(mdt); i++) { md = file_findmetadata(xp, mdt[i]); if (md) { bcopy(md->md_data, &vaddr, sizeof vaddr); diff --git a/usr/src/boot/sys/boot/efi/loader/main.c b/usr/src/boot/sys/boot/efi/loader/main.c index 5dc1099cdd..249be4a95e 100644 --- a/usr/src/boot/sys/boot/efi/loader/main.c +++ b/usr/src/boot/sys/boot/efi/loader/main.c @@ -79,8 +79,8 @@ static void efi_zfs_probe(void); /* * Need this because EFI uses UTF-16 unicode string constants, but we - * use UTF-8. We can't use printf due to the possiblity of \0 and we - * don't support support wide characters either. + * use UTF-8. We can't use printf due to the possibility of \0 and we + * don't support wide characters either. */ static void print_str16(const CHAR16 *str) diff --git a/usr/src/boot/sys/boot/fdt/fdt_loader_cmd.c b/usr/src/boot/sys/boot/fdt/fdt_loader_cmd.c index 662d004807..b0b7ef568c 100644 --- a/usr/src/boot/sys/boot/fdt/fdt_loader_cmd.c +++ b/usr/src/boot/sys/boot/fdt/fdt_loader_cmd.c @@ -157,7 +157,7 @@ fdt_find_static_dtb() } /* - * The most efficent way to find a symbol would be to calculate a + * The most efficient way to find a symbol would be to calculate a * hash, find proper bucket and chain, and thus find a symbol. * However, that would involve code duplication (e.g. for hash * function). So we're using simpler and a bit slower way: we're @@ -533,7 +533,7 @@ fdt_fixup_memory(struct fdt_mem_region *region, size_t num) if (fdt_get_mem_rsv(fdtp, i, &rstart, &rsize)) break; if (rsize) { - /* Ensure endianess, and put cells into a buffer */ + /* Ensure endianness, and put cells into a buffer */ if (addr_cells == 2) *(uint64_t *)buf = cpu_to_fdt64(rstart); @@ -583,7 +583,7 @@ fdt_fixup_memory(struct fdt_mem_region *region, size_t num) for (i = 0; i < num; i++) { curmr = ®ion[i]; if (curmr->size != 0) { - /* Ensure endianess, and put cells into a buffer */ + /* Ensure endianness, and put cells into a buffer */ if (addr_cells == 2) *(uint64_t *)buf = cpu_to_fdt64(curmr->start); diff --git a/usr/src/boot/sys/boot/forth/support.4th b/usr/src/boot/sys/boot/forth/support.4th index 95848c5416..16b8a88846 100644 --- a/usr/src/boot/sys/boot/forth/support.4th +++ b/usr/src/boot/sys/boot/forth/support.4th @@ -1146,10 +1146,15 @@ string current_file_name_ref \ used to print the file name ; : scan_conf_dir ( -- addr len -1 | 0 ) - s" currdev" getenv dup -1 <> if - s" pxe0:" compare 0= if 0 exit then \ readdir does not work on tftp - else - drop + s" currdev" getenv -1 <> if + dup 3 \ we only need first 3 chars + s" pxe" compare 0= + swap 3 + s" net" compare 0= or if + s" boot.tftproot.server" getenv? if + 0 exit \ readdir does not work on tftp + then + then then ['] entries catch if diff --git a/usr/src/boot/sys/boot/i386/libfirewire/dconsole.c b/usr/src/boot/sys/boot/i386/libfirewire/dconsole.c index 16645e259c..eccdc77799 100644 --- a/usr/src/boot/sys/boot/i386/libfirewire/dconsole.c +++ b/usr/src/boot/sys/boot/i386/libfirewire/dconsole.c @@ -47,13 +47,13 @@ static int dcons_started = 0; static struct dcons_softc sc[DCONS_NPORT]; uint32_t dcons_paddr; -/* The buffer must be allocated in BSS becase: +/* The buffer must be allocated in BSS because: * - The dcons driver in the kernel is initialized before VM/pmap is - * initialized, so that the buffer must be allocate in the region + * initialized, so that the buffer must be allocated in the region * that is mapped at the very early boot state. - * - We expect identiy map only for regions before KERNLOAD + * - We expect identity map only for regions before KERNLOAD * (i386:4MB amd64:1MB). - * - It seems that heap in conventional memory(640KB) is not sufficent + * - It seems that heap in conventional memory(640KB) is not sufficient * and we move it to high address as LOADER_SUPPORT_BZIP2. * - BSS is placed in conventional memory. */ diff --git a/usr/src/boot/sys/boot/i386/libfirewire/fwohci.c b/usr/src/boot/sys/boot/i386/libfirewire/fwohci.c index 326e44b2ec..cd47708851 100644 --- a/usr/src/boot/sys/boot/i386/libfirewire/fwohci.c +++ b/usr/src/boot/sys/boot/i386/libfirewire/fwohci.c @@ -214,10 +214,10 @@ fwohci_reset(struct fwohci_softc *sc, device_t dev) int i, max_rec, speed; uint32_t reg, reg2; - /* Disable interrupts */ + /* Disable interrupts */ OWRITE(sc, FWOHCI_INTMASKCLR, ~0); - /* FLUSH FIFO and reset Transmitter/Reciever */ + /* FLUSH FIFO and reset Transmitter/Receiver */ OWRITE(sc, OHCI_HCCCTL, OHCI_HCC_RESET); if (firewire_debug) device_printf(dev, "resetting OHCI..."); @@ -297,7 +297,7 @@ fwohci_init(struct fwohci_softc *sc, device_t dev) return (ENXIO); #if 0 -/* SID recieve buffer must align 2^11 */ +/* SID receive buffer must align 2^11 */ #define OHCI_SIDSIZE (1 << 11) sc->sid_buf = fwdma_malloc(&sc->fc, OHCI_SIDSIZE, OHCI_SIDSIZE, &sc->sid_dma, BUS_DMA_WAITOK); diff --git a/usr/src/boot/sys/boot/i386/libi386/amd64_tramp.S b/usr/src/boot/sys/boot/i386/libi386/amd64_tramp.S index fe0cf83c9d..d044c05814 100644 --- a/usr/src/boot/sys/boot/i386/libi386/amd64_tramp.S +++ b/usr/src/boot/sys/boot/i386/libi386/amd64_tramp.S @@ -95,8 +95,8 @@ amd64_tramp: movl %cr0, %eax orl $CR0_PG, %eax movl %eax, %cr0 - - /* Now we're in compatability mode. set %cs for long mode */ + + /* Now we're in compatibility mode. set %cs for long mode */ movl $VTOP(gdtdesc), %eax movl VTOP(entry_hi), %esi movl VTOP(entry_lo), %edi diff --git a/usr/src/boot/sys/boot/i386/libi386/bioscd.c b/usr/src/boot/sys/boot/i386/libi386/bioscd.c index 0d51bd29db..6a27f80060 100644 --- a/usr/src/boot/sys/boot/i386/libi386/bioscd.c +++ b/usr/src/boot/sys/boot/i386/libi386/bioscd.c @@ -95,9 +95,9 @@ static int nbcinfo = 0; static int bc_read(int unit, daddr_t dblk, int blks, caddr_t dest); static int bc_init(void); static int bc_strategy(void *devdata, int flag, daddr_t dblk, - size_t offset, size_t size, char *buf, size_t *rsize); + size_t size, char *buf, size_t *rsize); static int bc_realstrategy(void *devdata, int flag, daddr_t dblk, - size_t offset, size_t size, char *buf, size_t *rsize); + size_t size, char *buf, size_t *rsize); static int bc_open(struct open_file *f, ...); static int bc_close(struct open_file *f); static int bc_print(int verbose); @@ -238,7 +238,7 @@ bc_close(struct open_file *f) } static int -bc_strategy(void *devdata, int rw, daddr_t dblk, size_t offset, size_t size, +bc_strategy(void *devdata, int rw, daddr_t dblk, size_t size, char *buf, size_t *rsize) { struct bcache_devdata bcd; @@ -249,11 +249,11 @@ bc_strategy(void *devdata, int rw, daddr_t dblk, size_t offset, size_t size, bcd.dv_devdata = devdata; bcd.dv_cache = BC(dev).bc_bcache; - return (bcache_strategy(&bcd, rw, dblk, offset, size, buf, rsize)); + return (bcache_strategy(&bcd, rw, dblk, size, buf, rsize)); } static int -bc_realstrategy(void *devdata, int rw, daddr_t dblk, size_t offset, size_t size, +bc_realstrategy(void *devdata, int rw, daddr_t dblk, size_t size, char *buf, size_t *rsize) { struct i386_devdesc *dev; diff --git a/usr/src/boot/sys/boot/i386/libi386/biosdisk.c b/usr/src/boot/sys/boot/i386/libi386/biosdisk.c index eb0316e77a..d4e7a4b2d8 100644 --- a/usr/src/boot/sys/boot/i386/libi386/biosdisk.c +++ b/usr/src/boot/sys/boot/i386/libi386/biosdisk.c @@ -100,10 +100,10 @@ static int bd_write(struct disk_devdesc *dev, daddr_t dblk, int blks, static int bd_int13probe(struct bdinfo *bd); static int bd_init(void); -static int bd_strategy(void *devdata, int flag, daddr_t dblk, size_t offset, - size_t size, char *buf, size_t *rsize); -static int bd_realstrategy(void *devdata, int flag, daddr_t dblk, size_t offset, - size_t size, char *buf, size_t *rsize); +static int bd_strategy(void *devdata, int flag, daddr_t dblk, size_t size, + char *buf, size_t *rsize); +static int bd_realstrategy(void *devdata, int flag, daddr_t dblk, size_t size, + char *buf, size_t *rsize); static int bd_open(struct open_file *f, ...); static int bd_close(struct open_file *f); static int bd_ioctl(struct open_file *f, u_long cmd, void *data); @@ -388,7 +388,7 @@ bd_ioctl(struct open_file *f, u_long cmd, void *data) } static int -bd_strategy(void *devdata, int rw, daddr_t dblk, size_t offset, size_t size, +bd_strategy(void *devdata, int rw, daddr_t dblk, size_t size, char *buf, size_t *rsize) { struct bcache_devdata bcd; @@ -399,12 +399,12 @@ bd_strategy(void *devdata, int rw, daddr_t dblk, size_t offset, size_t size, bcd.dv_devdata = devdata; bcd.dv_cache = BD(dev).bd_bcache; - return (bcache_strategy(&bcd, rw, dblk + dev->d_offset, offset, size, + return (bcache_strategy(&bcd, rw, dblk + dev->d_offset, size, buf, rsize)); } static int -bd_realstrategy(void *devdata, int rw, daddr_t dblk, size_t offset, size_t size, +bd_realstrategy(void *devdata, int rw, daddr_t dblk, size_t size, char *buf, size_t *rsize) { struct disk_devdesc *dev = (struct disk_devdesc *)devdata; diff --git a/usr/src/boot/sys/boot/i386/libi386/pxe.c b/usr/src/boot/sys/boot/i386/libi386/pxe.c index de2e45c10a..f943ef5ec8 100644 --- a/usr/src/boot/sys/boot/i386/libi386/pxe.c +++ b/usr/src/boot/sys/boot/i386/libi386/pxe.c @@ -71,7 +71,7 @@ static void bangpxe_call(int func); static int pxe_init(void); static int pxe_strategy(void *devdata, int flag, daddr_t dblk, - size_t offset, size_t size, char *buf, size_t *rsize); + size_t size, char *buf, size_t *rsize); static int pxe_open(struct open_file *f, ...); static int pxe_close(struct open_file *f); static int pxe_print(int verbose); @@ -246,7 +246,7 @@ pxe_init(void) static int -pxe_strategy(void *devdata, int flag, daddr_t dblk, size_t offset, size_t size, +pxe_strategy(void *devdata, int flag, daddr_t dblk, size_t size, char *buf, size_t *rsize) { return (EIO); diff --git a/usr/src/boot/sys/boot/i386/libi386/pxe.h b/usr/src/boot/sys/boot/i386/libi386/pxe.h index 651bdcd35f..cdad520fe0 100644 --- a/usr/src/boot/sys/boot/i386/libi386/pxe.h +++ b/usr/src/boot/sys/boot/i386/libi386/pxe.h @@ -226,7 +226,7 @@ typedef struct { #define PXENV_UNDI_SET_STATION_ADDRESS 0x000A typedef struct { PXENV_STATUS_t Status; - MAC_ADDR StationAddress; /* Temp MAC addres to use */ + MAC_ADDR StationAddress; /* Temp MAC address to use */ } PACKED t_PXENV_UNDI_SET_STATION_ADDR; #define PXENV_UNDI_SET_PACKET_FILTER 0x000B @@ -330,7 +330,7 @@ typedef struct { PXENV_STATUS_t Status; uint16_t FuncFlag; /* PXENV_UNDI_ISR_OUT_xxx */ uint16_t BufferLength; /* Length of Frame */ - uint16_t FrameLength; /* Total length of reciever frame */ + uint16_t FrameLength; /* Total length of receiver frame */ uint16_t FrameHeaderLength; /* Length of the media header in Frame */ SEGOFF16_t Frame; /* receive buffer */ uint8_t ProtType; /* Protocol type */ @@ -344,7 +344,7 @@ typedef struct { # define PXENV_UNDI_ISR_OUT_NOT_OUTS 1 /* - * one of these will bre returnd for PXEND_UNDI_ISR_IN_PROCESS + * one of these will be returned for PXEND_UNDI_ISR_IN_PROCESS * and PXENV_UNDI_ISR_IN_GET_NEXT */ # define PXENV_UNDI_ISR_OUT_DONE 0 diff --git a/usr/src/boot/sys/boot/ofw/common/main.c b/usr/src/boot/sys/boot/ofw/common/main.c index 0913f0c9c2..1435a11d36 100644 --- a/usr/src/boot/sys/boot/ofw/common/main.c +++ b/usr/src/boot/sys/boot/ofw/common/main.c @@ -98,7 +98,7 @@ main(int (*openfirm)(void *)) char **bargv; /* - * Initalise the Open Firmware routines by giving them the entry point. + * Initialize the Open Firmware routines by giving them the entry point. */ OF_init(openfirm); diff --git a/usr/src/boot/sys/boot/uboot/common/metadata.c b/usr/src/boot/sys/boot/uboot/common/metadata.c index c00b56006d..38db4bca44 100644 --- a/usr/src/boot/sys/boot/uboot/common/metadata.c +++ b/usr/src/boot/sys/boot/uboot/common/metadata.c @@ -349,7 +349,7 @@ md_load(char *args, vm_offset_t *modulep) /* Do relocation fixup on metadata of each module. */ for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) { - for (i = 0; i < sizeof mdt / sizeof mdt[0]; i++) { + for (i = 0; i < nitems(mdt); i++) { md = file_findmetadata(xp, mdt[i]); if (md) { bcopy(md->md_data, &vaddr, sizeof vaddr); diff --git a/usr/src/boot/sys/boot/uboot/fdt/uboot_fdt.c b/usr/src/boot/sys/boot/uboot/fdt/uboot_fdt.c index 6b646f63dc..46882338a8 100644 --- a/usr/src/boot/sys/boot/uboot/fdt/uboot_fdt.c +++ b/usr/src/boot/sys/boot/uboot/fdt/uboot_fdt.c @@ -141,7 +141,7 @@ fdt_platform_fixups(void) if (n != 0) { /* - * Find the lenght of the interface id by + * Find the length of the interface id by * taking in to account the first 3 and * last 4 characters. */ diff --git a/usr/src/boot/sys/boot/zfs/zfs.c b/usr/src/boot/sys/boot/zfs/zfs.c index b298618771..b9e6be06eb 100644 --- a/usr/src/boot/sys/boot/zfs/zfs.c +++ b/usr/src/boot/sys/boot/zfs/zfs.c @@ -593,8 +593,8 @@ zfs_dev_close(struct open_file *f) } static int -zfs_dev_strategy(void *devdata, int rw, daddr_t dblk, size_t offset, - size_t size, char *buf, size_t *rsize) +zfs_dev_strategy(void *devdata, int rw, daddr_t dblk, size_t size, + char *buf, size_t *rsize) { return (ENOSYS); diff --git a/usr/src/head/errno.h b/usr/src/head/errno.h index cfabb2716b..d3cf1bff16 100644 --- a/usr/src/head/errno.h +++ b/usr/src/head/errno.h @@ -32,8 +32,6 @@ #ifndef _ERRNO_H #define _ERRNO_H -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.4.1.5 */ - /* * Error codes */ diff --git a/usr/src/head/iso/limits_iso.h b/usr/src/head/iso/limits_iso.h index 4d979cab1f..d1cce47dd7 100644 --- a/usr/src/head/iso/limits_iso.h +++ b/usr/src/head/iso/limits_iso.h @@ -43,8 +43,6 @@ #ifndef _ISO_LIMITS_ISO_H #define _ISO_LIMITS_ISO_H -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.34 */ - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/head/iso/stdarg_c99.h b/usr/src/head/iso/stdarg_c99.h index 628f555b4e..3d21bb41ad 100644 --- a/usr/src/head/iso/stdarg_c99.h +++ b/usr/src/head/iso/stdarg_c99.h @@ -31,8 +31,6 @@ #ifndef _ISO_STDARG_C99_H #define _ISO_STDARG_C99_H -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.8 */ - /* * An application should not include this header directly. Instead it * should be included only through the inclusion of other Sun headers. diff --git a/usr/src/head/iso/stdarg_iso.h b/usr/src/head/iso/stdarg_iso.h index abc0fed4ac..ce8abe047b 100644 --- a/usr/src/head/iso/stdarg_iso.h +++ b/usr/src/head/iso/stdarg_iso.h @@ -43,8 +43,6 @@ #ifndef _ISO_STDARG_ISO_H #define _ISO_STDARG_ISO_H -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.8 */ - /* * This header defines the ISO C 1989 and ISO C++ 1998 variable * argument definitions. diff --git a/usr/src/head/rctl.h b/usr/src/head/rctl.h index 6bc8b9e9be..c1ebc6864d 100644 --- a/usr/src/head/rctl.h +++ b/usr/src/head/rctl.h @@ -27,8 +27,6 @@ #ifndef _RCTL_H #define _RCTL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/rctl.h> #include <sys/types.h> diff --git a/usr/src/head/stdint.h b/usr/src/head/stdint.h index bd87d1ad15..135d0bc2fb 100644 --- a/usr/src/head/stdint.h +++ b/usr/src/head/stdint.h @@ -27,8 +27,6 @@ #ifndef _STDINT_H #define _STDINT_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This header was introduced by the ISO C Standard, ISO/IEC * 9899:1999 Programming language - C. It is a subset of the diff --git a/usr/src/head/stdio_impl.h b/usr/src/head/stdio_impl.h index 54ca353aab..734ef2671c 100644 --- a/usr/src/head/stdio_impl.h +++ b/usr/src/head/stdio_impl.h @@ -27,8 +27,6 @@ #ifndef _STDIO_IMPL_H #define _STDIO_IMPL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/isa_defs.h> #ifdef __cplusplus diff --git a/usr/src/head/stdio_tag.h b/usr/src/head/stdio_tag.h index 818845a016..5377719988 100644 --- a/usr/src/head/stdio_tag.h +++ b/usr/src/head/stdio_tag.h @@ -27,8 +27,6 @@ #ifndef _STDIO_TAG_H #define _STDIO_TAG_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/head/termios.h b/usr/src/head/termios.h index dfa6ca05eb..13bd97f7d5 100644 --- a/usr/src/head/termios.h +++ b/usr/src/head/termios.h @@ -26,8 +26,6 @@ #ifndef _TERMIOS_H #define _TERMIOS_H -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */ - #include <sys/termios.h> #endif /* _TERMIOS_H */ diff --git a/usr/src/lib/libbe/Makefile.com b/usr/src/lib/libbe/Makefile.com index f1c828194c..8c939917a3 100644 --- a/usr/src/lib/libbe/Makefile.com +++ b/usr/src/lib/libbe/Makefile.com @@ -54,9 +54,6 @@ C99MODE= $(C99_ENABLE) LDLIBS += -lficl-sys -lzfs -linstzones -luuid -lnvpair -lc -lgen LDLIBS += -ldevinfo -lefi CPPFLAGS += $(INCS) -CERRWARN += -_gcc=-Wno-unused-label -CERRWARN += -_gcc=-Wno-uninitialized -CERRWARN += -_gcc=-Wno-address CLOBBERFILES += $(LIBRARY) diff --git a/usr/src/lib/libbe/common/be_list.c b/usr/src/lib/libbe/common/be_list.c index 2534b7c32c..d56a9b6974 100644 --- a/usr/src/lib/libbe/common/be_list.c +++ b/usr/src/lib/libbe/common/be_list.c @@ -355,11 +355,9 @@ be_free_list(be_node_list_t *be_nodes) * Semi-private (library wide use only) */ int -be_get_zone_be_list( /* LINTED */ - char *zone_be_name, - char *zone_be_container_ds, - be_node_list_t **zbe_nodes) +be_get_zone_be_list(char *zone_be_name, char *zone_be_container_ds, + be_node_list_t **zbe_nodes) { zfs_handle_t *zhp = NULL; list_callback_data_t cb = { 0 }; @@ -1067,7 +1065,7 @@ be_get_node_data( be_node->be_active_on_boot = B_TRUE; else be_node->be_active_on_boot = B_FALSE; - else if (prop_buf != NULL && strcmp(prop_buf, be_ds) == 0) + else if (strcmp(prop_buf, be_ds) == 0) be_node->be_active_on_boot = B_TRUE; else be_node->be_active_on_boot = B_FALSE; diff --git a/usr/src/lib/libbe/common/be_utils.c b/usr/src/lib/libbe/common/be_utils.c index 1d79c51a4f..fb2f662fc7 100644 --- a/usr/src/lib/libbe/common/be_utils.c +++ b/usr/src/lib/libbe/common/be_utils.c @@ -1519,7 +1519,7 @@ be_change_grub_default(char *be_name, char *be_root_pool) { zfs_handle_t *zhp = NULL; char grub_file[MAXPATHLEN]; - char *temp_grub; + char *temp_grub = NULL; char *pool_mntpnt = NULL; char *ptmp_mntpnt = NULL; char *orig_mntpnt = NULL; diff --git a/usr/src/lib/libbe/common/be_zones.c b/usr/src/lib/libbe/common/be_zones.c index 8b2af7efee..e257b62125 100644 --- a/usr/src/lib/libbe/common/be_zones.c +++ b/usr/src/lib/libbe/common/be_zones.c @@ -111,7 +111,7 @@ int be_find_active_zone_root(zfs_handle_t *be_zhp, char *zonepath_ds, char *zoneroot_ds, int zoneroot_ds_size) { - active_zone_root_data_t azr_data = { 0 }; + active_zone_root_data_t azr_data = { { 0 }, NULL }; zfs_handle_t *zhp; char zone_container_ds[MAXPATHLEN]; int ret = BE_SUCCESS; diff --git a/usr/src/lib/libmd/common/md5.h b/usr/src/lib/libmd/common/md5.h index 39525cf355..dd0c249cf9 100644 --- a/usr/src/lib/libmd/common/md5.h +++ b/usr/src/lib/libmd/common/md5.h @@ -6,8 +6,6 @@ #ifndef _MD5_H #define _MD5_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * MD5.H - header file for MD5C.C */ diff --git a/usr/src/man/man9f/Makefile b/usr/src/man/man9f/Makefile index 70bd48c3d9..ea8a999df9 100644 --- a/usr/src/man/man9f/Makefile +++ b/usr/src/man/man9f/Makefile @@ -21,308 +21,308 @@ include $(SRC)/Makefile.master MANSECT= 9f -MANFILES= ASSERT.9f \ - Intro.9f \ - OTHERQ.9f \ - RD.9f \ - SAMESTR.9f \ - STRUCT_DECL.9f \ - WR.9f \ - adjmsg.9f \ - allocb.9f \ - atomic_add.9f \ - atomic_and.9f \ - atomic_bits.9f \ - atomic_cas.9f \ - atomic_dec.9f \ - atomic_inc.9f \ - atomic_ops.9f \ - atomic_or.9f \ - atomic_swap.9f \ +MANFILES= ASSERT.9f \ + Intro.9f \ + OTHERQ.9f \ + RD.9f \ + SAMESTR.9f \ + STRUCT_DECL.9f \ + WR.9f \ + adjmsg.9f \ + allocb.9f \ + atomic_add.9f \ + atomic_and.9f \ + atomic_bits.9f \ + atomic_cas.9f \ + atomic_dec.9f \ + atomic_inc.9f \ + atomic_ops.9f \ + atomic_or.9f \ + atomic_swap.9f \ avl.9f \ - backq.9f \ - bcanput.9f \ - bcmp.9f \ - bcopy.9f \ - bioclone.9f \ - biodone.9f \ - bioerror.9f \ - biofini.9f \ - bioinit.9f \ - biomodified.9f \ - bioreset.9f \ - biosize.9f \ - biowait.9f \ - bp_copyin.9f \ - bp_copyout.9f \ - bp_mapin.9f \ - bp_mapout.9f \ - btop.9f \ - btopr.9f \ - bufcall.9f \ - bzero.9f \ - canput.9f \ - canputnext.9f \ - clrbuf.9f \ - cmn_err.9f \ - condvar.9f \ - copyb.9f \ - copyin.9f \ - copymsg.9f \ - copyout.9f \ - csx_AccessConfigurationRegister.9f \ - csx_CS_DDI_Info.9f \ - csx_ConvertSize.9f \ - csx_ConvertSpeed.9f \ - csx_DeregisterClient.9f \ - csx_DupHandle.9f \ - csx_Error2Text.9f \ - csx_Event2Text.9f \ - csx_FreeHandle.9f \ - csx_Get8.9f \ - csx_GetFirstClient.9f \ - csx_GetFirstTuple.9f \ - csx_GetHandleOffset.9f \ - csx_GetMappedAddr.9f \ - csx_GetStatus.9f \ - csx_GetTupleData.9f \ - csx_MakeDeviceNode.9f \ - csx_MapLogSocket.9f \ - csx_MapMemPage.9f \ - csx_ModifyConfiguration.9f \ - csx_ModifyWindow.9f \ - csx_ParseTuple.9f \ - csx_Parse_CISTPL_BATTERY.9f \ - csx_Parse_CISTPL_BYTEORDER.9f \ - csx_Parse_CISTPL_CFTABLE_ENTRY.9f \ - csx_Parse_CISTPL_CONFIG.9f \ - csx_Parse_CISTPL_DATE.9f \ - csx_Parse_CISTPL_DEVICE.9f \ - csx_Parse_CISTPL_DEVICEGEO.9f \ - csx_Parse_CISTPL_DEVICEGEO_A.9f \ - csx_Parse_CISTPL_FORMAT.9f \ - csx_Parse_CISTPL_FUNCE.9f \ - csx_Parse_CISTPL_FUNCID.9f \ - csx_Parse_CISTPL_GEOMETRY.9f \ - csx_Parse_CISTPL_JEDEC_C.9f \ - csx_Parse_CISTPL_LINKTARGET.9f \ - csx_Parse_CISTPL_LONGLINK_A.9f \ - csx_Parse_CISTPL_LONGLINK_MFC.9f \ - csx_Parse_CISTPL_MANFID.9f \ - csx_Parse_CISTPL_ORG.9f \ - csx_Parse_CISTPL_SPCL.9f \ - csx_Parse_CISTPL_SWIL.9f \ - csx_Parse_CISTPL_VERS_1.9f \ - csx_Parse_CISTPL_VERS_2.9f \ - csx_Put8.9f \ - csx_RegisterClient.9f \ - csx_ReleaseConfiguration.9f \ - csx_RepGet8.9f \ - csx_RepPut8.9f \ - csx_RequestConfiguration.9f \ - csx_RequestIO.9f \ - csx_RequestIRQ.9f \ - csx_RequestSocketMask.9f \ - csx_RequestWindow.9f \ - csx_ResetFunction.9f \ - csx_SetEventMask.9f \ - csx_SetHandleOffset.9f \ - csx_ValidateCIS.9f \ - datamsg.9f \ - ddi_add_event_handler.9f \ - ddi_add_intr.9f \ - ddi_add_softintr.9f \ - ddi_binding_name.9f \ - ddi_btop.9f \ - ddi_can_receive_sig.9f \ - ddi_cb_register.9f \ - ddi_check_acc_handle.9f \ - ddi_copyin.9f \ - ddi_copyout.9f \ - ddi_create_minor_node.9f \ - ddi_cred.9f \ - ddi_dev_is_needed.9f \ - ddi_dev_is_sid.9f \ - ddi_dev_nintrs.9f \ - ddi_dev_nregs.9f \ - ddi_dev_regsize.9f \ - ddi_dev_report_fault.9f \ - ddi_device_copy.9f \ - ddi_device_zero.9f \ - ddi_devid_compare.9f \ - ddi_dma_addr_bind_handle.9f \ - ddi_dma_alloc_handle.9f \ - ddi_dma_buf_bind_handle.9f \ - ddi_dma_burstsizes.9f \ - ddi_dma_free_handle.9f \ - ddi_dma_getwin.9f \ - ddi_dma_mem_alloc.9f \ - ddi_dma_mem_free.9f \ - ddi_dma_nextcookie.9f \ - ddi_dma_numwin.9f \ - ddi_dma_set_sbus64.9f \ - ddi_dma_sync.9f \ - ddi_dma_unbind_handle.9f \ - ddi_dmae.9f \ - ddi_driver_major.9f \ - ddi_driver_name.9f \ - ddi_enter_critical.9f \ - ddi_ffs.9f \ - ddi_fm_acc_err_clear.9f \ - ddi_fm_acc_err_get.9f \ - ddi_fm_ereport_post.9f \ - ddi_fm_handler_register.9f \ - ddi_fm_init.9f \ - ddi_fm_service_impact.9f \ - ddi_get8.9f \ - ddi_get_cred.9f \ - ddi_get_devstate.9f \ - ddi_get_driver_private.9f \ - ddi_get_eventcookie.9f \ - ddi_get_instance.9f \ - ddi_get_kt_did.9f \ - ddi_get_lbolt.9f \ - ddi_get_parent.9f \ - ddi_get_pid.9f \ - ddi_get_time.9f \ - ddi_getiminor.9f \ - ddi_in_panic.9f \ - ddi_intr_add_handler.9f \ - ddi_intr_add_softint.9f \ - ddi_intr_alloc.9f \ - ddi_intr_dup_handler.9f \ - ddi_intr_enable.9f \ - ddi_intr_get_cap.9f \ - ddi_intr_get_hilevel_pri.9f \ - ddi_intr_get_nintrs.9f \ - ddi_intr_get_pending.9f \ - ddi_intr_get_pri.9f \ - ddi_intr_get_supported_types.9f \ - ddi_intr_hilevel.9f \ - ddi_intr_set_mask.9f \ - ddi_intr_set_nreq.9f \ - ddi_io_get8.9f \ - ddi_io_put8.9f \ - ddi_io_rep_get8.9f \ - ddi_io_rep_put8.9f \ - ddi_log_sysevent.9f \ - ddi_map_regs.9f \ - ddi_mem_get8.9f \ - ddi_mem_put8.9f \ - ddi_mem_rep_get8.9f \ - ddi_mem_rep_put8.9f \ - ddi_mmap_get_model.9f \ - ddi_model_convert_from.9f \ - ddi_modopen.9f \ - ddi_no_info.9f \ - ddi_node_name.9f \ - ddi_peek.9f \ - ddi_periodic_add.9f \ - ddi_periodic_delete.9f \ - ddi_poke.9f \ - ddi_prop_create.9f \ - ddi_prop_exists.9f \ - ddi_prop_get_int.9f \ - ddi_prop_lookup.9f \ - ddi_prop_op.9f \ - ddi_prop_update.9f \ - ddi_put8.9f \ - ddi_regs_map_free.9f \ - ddi_regs_map_setup.9f \ - ddi_remove_event_handler.9f \ - ddi_remove_minor_node.9f \ - ddi_removing_power.9f \ - ddi_rep_get8.9f \ - ddi_rep_put8.9f \ - ddi_report_dev.9f \ - ddi_root_node.9f \ - ddi_segmap.9f \ - ddi_slaveonly.9f \ - ddi_soft_state.9f \ - ddi_strtol.9f \ - ddi_strtoll.9f \ - ddi_strtoul.9f \ - ddi_umem_alloc.9f \ - ddi_umem_iosetup.9f \ - ddi_umem_lock.9f \ - delay.9f \ + backq.9f \ + bcanput.9f \ + bcmp.9f \ + bcopy.9f \ + bioclone.9f \ + biodone.9f \ + bioerror.9f \ + biofini.9f \ + bioinit.9f \ + biomodified.9f \ + bioreset.9f \ + biosize.9f \ + biowait.9f \ + bp_copyin.9f \ + bp_copyout.9f \ + bp_mapin.9f \ + bp_mapout.9f \ + btop.9f \ + btopr.9f \ + bufcall.9f \ + bzero.9f \ + canput.9f \ + canputnext.9f \ + clrbuf.9f \ + cmn_err.9f \ + condvar.9f \ + copyb.9f \ + copyin.9f \ + copymsg.9f \ + copyout.9f \ + csx_AccessConfigurationRegister.9f \ + csx_CS_DDI_Info.9f \ + csx_ConvertSize.9f \ + csx_ConvertSpeed.9f \ + csx_DeregisterClient.9f \ + csx_DupHandle.9f \ + csx_Error2Text.9f \ + csx_Event2Text.9f \ + csx_FreeHandle.9f \ + csx_Get8.9f \ + csx_GetFirstClient.9f \ + csx_GetFirstTuple.9f \ + csx_GetHandleOffset.9f \ + csx_GetMappedAddr.9f \ + csx_GetStatus.9f \ + csx_GetTupleData.9f \ + csx_MakeDeviceNode.9f \ + csx_MapLogSocket.9f \ + csx_MapMemPage.9f \ + csx_ModifyConfiguration.9f \ + csx_ModifyWindow.9f \ + csx_ParseTuple.9f \ + csx_Parse_CISTPL_BATTERY.9f \ + csx_Parse_CISTPL_BYTEORDER.9f \ + csx_Parse_CISTPL_CFTABLE_ENTRY.9f \ + csx_Parse_CISTPL_CONFIG.9f \ + csx_Parse_CISTPL_DATE.9f \ + csx_Parse_CISTPL_DEVICE.9f \ + csx_Parse_CISTPL_DEVICEGEO.9f \ + csx_Parse_CISTPL_DEVICEGEO_A.9f \ + csx_Parse_CISTPL_FORMAT.9f \ + csx_Parse_CISTPL_FUNCE.9f \ + csx_Parse_CISTPL_FUNCID.9f \ + csx_Parse_CISTPL_GEOMETRY.9f \ + csx_Parse_CISTPL_JEDEC_C.9f \ + csx_Parse_CISTPL_LINKTARGET.9f \ + csx_Parse_CISTPL_LONGLINK_A.9f \ + csx_Parse_CISTPL_LONGLINK_MFC.9f \ + csx_Parse_CISTPL_MANFID.9f \ + csx_Parse_CISTPL_ORG.9f \ + csx_Parse_CISTPL_SPCL.9f \ + csx_Parse_CISTPL_SWIL.9f \ + csx_Parse_CISTPL_VERS_1.9f \ + csx_Parse_CISTPL_VERS_2.9f \ + csx_Put8.9f \ + csx_RegisterClient.9f \ + csx_ReleaseConfiguration.9f \ + csx_RepGet8.9f \ + csx_RepPut8.9f \ + csx_RequestConfiguration.9f \ + csx_RequestIO.9f \ + csx_RequestIRQ.9f \ + csx_RequestSocketMask.9f \ + csx_RequestWindow.9f \ + csx_ResetFunction.9f \ + csx_SetEventMask.9f \ + csx_SetHandleOffset.9f \ + csx_ValidateCIS.9f \ + datamsg.9f \ + ddi_add_event_handler.9f \ + ddi_add_intr.9f \ + ddi_add_softintr.9f \ + ddi_binding_name.9f \ + ddi_btop.9f \ + ddi_can_receive_sig.9f \ + ddi_cb_register.9f \ + ddi_check_acc_handle.9f \ + ddi_copyin.9f \ + ddi_copyout.9f \ + ddi_create_minor_node.9f \ + ddi_cred.9f \ + ddi_dev_is_needed.9f \ + ddi_dev_is_sid.9f \ + ddi_dev_nintrs.9f \ + ddi_dev_nregs.9f \ + ddi_dev_regsize.9f \ + ddi_dev_report_fault.9f \ + ddi_device_copy.9f \ + ddi_device_zero.9f \ + ddi_devid_compare.9f \ + ddi_dma_addr_bind_handle.9f \ + ddi_dma_alloc_handle.9f \ + ddi_dma_buf_bind_handle.9f \ + ddi_dma_burstsizes.9f \ + ddi_dma_free_handle.9f \ + ddi_dma_getwin.9f \ + ddi_dma_mem_alloc.9f \ + ddi_dma_mem_free.9f \ + ddi_dma_nextcookie.9f \ + ddi_dma_numwin.9f \ + ddi_dma_set_sbus64.9f \ + ddi_dma_sync.9f \ + ddi_dma_unbind_handle.9f \ + ddi_dmae.9f \ + ddi_driver_major.9f \ + ddi_driver_name.9f \ + ddi_enter_critical.9f \ + ddi_ffs.9f \ + ddi_fm_acc_err_clear.9f \ + ddi_fm_acc_err_get.9f \ + ddi_fm_ereport_post.9f \ + ddi_fm_handler_register.9f \ + ddi_fm_init.9f \ + ddi_fm_service_impact.9f \ + ddi_get8.9f \ + ddi_get_cred.9f \ + ddi_get_devstate.9f \ + ddi_get_driver_private.9f \ + ddi_get_eventcookie.9f \ + ddi_get_instance.9f \ + ddi_get_kt_did.9f \ + ddi_get_lbolt.9f \ + ddi_get_parent.9f \ + ddi_get_pid.9f \ + ddi_get_time.9f \ + ddi_getiminor.9f \ + ddi_in_panic.9f \ + ddi_intr_add_handler.9f \ + ddi_intr_add_softint.9f \ + ddi_intr_alloc.9f \ + ddi_intr_dup_handler.9f \ + ddi_intr_enable.9f \ + ddi_intr_get_cap.9f \ + ddi_intr_get_hilevel_pri.9f \ + ddi_intr_get_nintrs.9f \ + ddi_intr_get_pending.9f \ + ddi_intr_get_pri.9f \ + ddi_intr_get_supported_types.9f \ + ddi_intr_hilevel.9f \ + ddi_intr_set_mask.9f \ + ddi_intr_set_nreq.9f \ + ddi_io_get8.9f \ + ddi_io_put8.9f \ + ddi_io_rep_get8.9f \ + ddi_io_rep_put8.9f \ + ddi_log_sysevent.9f \ + ddi_map_regs.9f \ + ddi_mem_get8.9f \ + ddi_mem_put8.9f \ + ddi_mem_rep_get8.9f \ + ddi_mem_rep_put8.9f \ + ddi_mmap_get_model.9f \ + ddi_model_convert_from.9f \ + ddi_modopen.9f \ + ddi_no_info.9f \ + ddi_node_name.9f \ + ddi_peek.9f \ + ddi_periodic_add.9f \ + ddi_periodic_delete.9f \ + ddi_poke.9f \ + ddi_prop_create.9f \ + ddi_prop_exists.9f \ + ddi_prop_get_int.9f \ + ddi_prop_lookup.9f \ + ddi_prop_op.9f \ + ddi_prop_update.9f \ + ddi_put8.9f \ + ddi_regs_map_free.9f \ + ddi_regs_map_setup.9f \ + ddi_remove_event_handler.9f \ + ddi_remove_minor_node.9f \ + ddi_removing_power.9f \ + ddi_rep_get8.9f \ + ddi_rep_put8.9f \ + ddi_report_dev.9f \ + ddi_root_node.9f \ + ddi_segmap.9f \ + ddi_slaveonly.9f \ + ddi_soft_state.9f \ + ddi_strtol.9f \ + ddi_strtoll.9f \ + ddi_strtoul.9f \ + ddi_umem_alloc.9f \ + ddi_umem_iosetup.9f \ + ddi_umem_lock.9f \ + delay.9f \ devfs_clean.9f \ - devmap_default_access.9f \ - devmap_devmem_setup.9f \ - devmap_do_ctxmgt.9f \ - devmap_set_ctx_timeout.9f \ - devmap_setup.9f \ - devmap_unload.9f \ - disksort.9f \ - dlbindack.9f \ - drv_getparm.9f \ - drv_hztousec.9f \ - drv_priv.9f \ - drv_usectohz.9f \ - drv_usecwait.9f \ - dupb.9f \ - dupmsg.9f \ - enableok.9f \ - esballoc.9f \ - esbbcall.9f \ + devmap_default_access.9f \ + devmap_devmem_setup.9f \ + devmap_do_ctxmgt.9f \ + devmap_set_ctx_timeout.9f \ + devmap_setup.9f \ + devmap_unload.9f \ + disksort.9f \ + dlbindack.9f \ + drv_getparm.9f \ + drv_hztousec.9f \ + drv_priv.9f \ + drv_usectohz.9f \ + drv_usecwait.9f \ + dupb.9f \ + dupmsg.9f \ + enableok.9f \ + esballoc.9f \ + esbbcall.9f \ firmload.9f \ - flushband.9f \ - flushq.9f \ - freeb.9f \ - freemsg.9f \ - freerbuf.9f \ - freezestr.9f \ - get_pktiopb.9f \ - geterror.9f \ - gethrtime.9f \ - getmajor.9f \ - getminor.9f \ - getq.9f \ - getrbuf.9f \ - gld.9f \ - hook_alloc.9f \ - hook_free.9f \ + flushband.9f \ + flushq.9f \ + freeb.9f \ + freemsg.9f \ + freerbuf.9f \ + freezestr.9f \ + get_pktiopb.9f \ + geterror.9f \ + gethrtime.9f \ + getmajor.9f \ + getminor.9f \ + getq.9f \ + getrbuf.9f \ + gld.9f \ + hook_alloc.9f \ + hook_free.9f \ + id32_alloc.9f \ id_space.9f \ - id32_alloc.9f \ - inb.9f \ - insq.9f \ - kiconv.9f \ - kiconv_close.9f \ - kiconv_open.9f \ - kiconvstr.9f \ - kmem_alloc.9f \ - kmem_cache_create.9f \ - kstat_create.9f \ - kstat_delete.9f \ - kstat_install.9f \ - kstat_named_init.9f \ - kstat_queue.9f \ - ldi_add_event_handler.9f \ - ldi_aread.9f \ - ldi_devmap.9f \ - ldi_dump.9f \ - ldi_ev_finalize.9f \ - ldi_ev_get_cookie.9f \ - ldi_ev_get_type.9f \ - ldi_ev_notify.9f \ - ldi_ev_register_callbacks.9f \ - ldi_ev_remove_callbacks.9f \ - ldi_get_dev.9f \ - ldi_get_eventcookie.9f \ - ldi_get_size.9f \ - ldi_ident_from_dev.9f \ - ldi_ioctl.9f \ - ldi_open_by_dev.9f \ - ldi_poll.9f \ - ldi_prop_exists.9f \ - ldi_prop_get_int.9f \ - ldi_prop_lookup_int_array.9f \ - ldi_putmsg.9f \ - ldi_read.9f \ - ldi_remove_event_handler.9f \ - ldi_strategy.9f \ - linkb.9f \ - list_create.9f \ + inb.9f \ + insq.9f \ + kiconv.9f \ + kiconv_close.9f \ + kiconv_open.9f \ + kiconvstr.9f \ + kmem_alloc.9f \ + kmem_cache_create.9f \ + kstat_create.9f \ + kstat_delete.9f \ + kstat_install.9f \ + kstat_named_init.9f \ + kstat_queue.9f \ + ldi_add_event_handler.9f \ + ldi_aread.9f \ + ldi_devmap.9f \ + ldi_dump.9f \ + ldi_ev_finalize.9f \ + ldi_ev_get_cookie.9f \ + ldi_ev_get_type.9f \ + ldi_ev_notify.9f \ + ldi_ev_register_callbacks.9f \ + ldi_ev_remove_callbacks.9f \ + ldi_get_dev.9f \ + ldi_get_eventcookie.9f \ + ldi_get_size.9f \ + ldi_ident_from_dev.9f \ + ldi_ioctl.9f \ + ldi_open_by_dev.9f \ + ldi_poll.9f \ + ldi_prop_exists.9f \ + ldi_prop_get_int.9f \ + ldi_prop_lookup_int_array.9f \ + ldi_putmsg.9f \ + ldi_read.9f \ + ldi_remove_event_handler.9f \ + ldi_strategy.9f \ + linkb.9f \ + list_create.9f \ mac_alloc.9f \ mac_hcksum_get.9f \ mac_init_ops.9f \ @@ -333,319 +333,321 @@ MANFILES= ASSERT.9f \ mac_register.9f \ mac_rx.9f \ mac_tx_update.9f \ - makecom.9f \ - makedevice.9f \ - max.9f \ - mcopyin.9f \ - mcopymsg.9f \ - mcopyout.9f \ - membar_ops.9f \ - memchr.9f \ - merror.9f \ - mexchange.9f \ - min.9f \ - mioc2ack.9f \ - miocack.9f \ - miocnak.9f \ - miocpullup.9f \ - mkiocb.9f \ - mod_install.9f \ - msgdsize.9f \ - msgpullup.9f \ - msgsize.9f \ - mt-streams.9f \ - mutex.9f \ - net_event_notify_register.9f \ - net_getifname.9f \ - net_getlifaddr.9f \ - net_getmtu.9f \ - net_getnetid.9f \ - net_getpmtuenabled.9f \ - net_hook_register.9f \ - net_hook_unregister.9f \ - net_inject.9f \ - net_inject_alloc.9f \ - net_inject_free.9f \ - net_instance_alloc.9f \ - net_instance_free.9f \ - net_instance_notify_register.9f \ - net_instance_register.9f \ - net_instance_unregister.9f \ - net_ispartialchecksum.9f \ - net_isvalidchecksum.9f \ - net_kstat_create.9f \ - net_kstat_delete.9f \ - net_lifgetnext.9f \ - net_netidtozonid.9f \ - net_phygetnext.9f \ - net_phylookup.9f \ - net_protocol_lookup.9f \ - net_protocol_notify_register.9f \ - net_protocol_release.9f \ - net_protocol_walk.9f \ - net_routeto.9f \ - net_zoneidtonetid.9f \ - netinfo.9f \ - nochpoll.9f \ - nodev.9f \ - noenable.9f \ - nulldev.9f \ - nvlist_add_boolean.9f \ - nvlist_alloc.9f \ - nvlist_lookup_boolean.9f \ - nvlist_lookup_nvpair.9f \ - nvlist_next_nvpair.9f \ - nvlist_remove.9f \ - nvpair_value_byte.9f \ - outb.9f \ - pci_config_get8.9f \ - pci_config_setup.9f \ - pci_ereport_setup.9f \ - pci_report_pmcap.9f \ - pci_save_config_regs.9f \ - physio.9f \ - pm_busy_component.9f \ - pm_power_has_changed.9f \ - pm_raise_power.9f \ - pm_trans_check.9f \ + makecom.9f \ + makedevice.9f \ + max.9f \ + mcopyin.9f \ + mcopymsg.9f \ + mcopyout.9f \ + membar_ops.9f \ + memchr.9f \ + merror.9f \ + mexchange.9f \ + min.9f \ + mioc2ack.9f \ + miocack.9f \ + miocnak.9f \ + miocpullup.9f \ + mkiocb.9f \ + mod_install.9f \ + msgdsize.9f \ + msgpullup.9f \ + msgsize.9f \ + mt-streams.9f \ + mutex.9f \ + net_event_notify_register.9f \ + net_getifname.9f \ + net_getlifaddr.9f \ + net_getmtu.9f \ + net_getnetid.9f \ + net_getpmtuenabled.9f \ + net_hook_register.9f \ + net_hook_unregister.9f \ + net_inject.9f \ + net_inject_alloc.9f \ + net_inject_free.9f \ + net_instance_alloc.9f \ + net_instance_free.9f \ + net_instance_notify_register.9f \ + net_instance_register.9f \ + net_instance_unregister.9f \ + net_ispartialchecksum.9f \ + net_isvalidchecksum.9f \ + net_kstat_create.9f \ + net_kstat_delete.9f \ + net_lifgetnext.9f \ + net_netidtozonid.9f \ + net_phygetnext.9f \ + net_phylookup.9f \ + net_protocol_lookup.9f \ + net_protocol_notify_register.9f \ + net_protocol_release.9f \ + net_protocol_walk.9f \ + net_routeto.9f \ + net_zoneidtonetid.9f \ + netinfo.9f \ + nochpoll.9f \ + nodev.9f \ + noenable.9f \ + nulldev.9f \ + nvlist_add_boolean.9f \ + nvlist_alloc.9f \ + nvlist_lookup_boolean.9f \ + nvlist_lookup_nvpair.9f \ + nvlist_next_nvpair.9f \ + nvlist_remove.9f \ + nvpair_value_byte.9f \ + outb.9f \ + pci_config_get8.9f \ + pci_config_setup.9f \ + pci_ereport_setup.9f \ + pci_report_pmcap.9f \ + pci_save_config_regs.9f \ + physio.9f \ + pm_busy_component.9f \ + pm_power_has_changed.9f \ + pm_raise_power.9f \ + pm_trans_check.9f \ pollhead_clean.9f \ - pollwakeup.9f \ - priv_getbyname.9f \ - priv_policy.9f \ - proc_signal.9f \ - ptob.9f \ - pullupmsg.9f \ - put.9f \ - putbq.9f \ - putctl.9f \ - putctl1.9f \ - putnext.9f \ - putnextctl.9f \ - putnextctl1.9f \ - putq.9f \ - qassociate.9f \ - qbufcall.9f \ - qenable.9f \ - qprocson.9f \ - qreply.9f \ - qsize.9f \ - qtimeout.9f \ - qunbufcall.9f \ - quntimeout.9f \ - qwait.9f \ - qwriter.9f \ - rmalloc.9f \ - rmalloc_wait.9f \ - rmallocmap.9f \ - rmfree.9f \ - rmvb.9f \ - rmvq.9f \ - rwlock.9f \ - scsi_abort.9f \ - scsi_alloc_consistent_buf.9f \ - scsi_cname.9f \ - scsi_destroy_pkt.9f \ - scsi_dmaget.9f \ - scsi_errmsg.9f \ - scsi_ext_sense_fields.9f \ - scsi_find_sense_descr.9f \ - scsi_free_consistent_buf.9f \ - scsi_get_device_type_scsi_options.9f \ - scsi_get_device_type_string.9f \ - scsi_hba_attach_setup.9f \ - scsi_hba_init.9f \ - scsi_hba_lookup_capstr.9f \ - scsi_hba_pkt_alloc.9f \ - scsi_hba_pkt_comp.9f \ - scsi_hba_probe.9f \ - scsi_hba_tran_alloc.9f \ - scsi_ifgetcap.9f \ - scsi_init_pkt.9f \ - scsi_log.9f \ - scsi_pktalloc.9f \ - scsi_poll.9f \ - scsi_probe.9f \ - scsi_reset.9f \ - scsi_reset_notify.9f \ - scsi_sense_key.9f \ - scsi_setup_cdb.9f \ - scsi_slave.9f \ - scsi_sync_pkt.9f \ - scsi_transport.9f \ - scsi_unprobe.9f \ - scsi_validate_sense.9f \ - scsi_vu_errmsg.9f \ - semaphore.9f \ - stoi.9f \ - string.9f \ - strlog.9f \ - strqget.9f \ - strqset.9f \ - swab.9f \ - taskq.9f \ - testb.9f \ - timeout.9f \ - u8_strcmp.9f \ - u8_textprep_str.9f \ - u8_validate.9f \ - uconv_u16tou32.9f \ - uiomove.9f \ - unbufcall.9f \ - unlinkb.9f \ - untimeout.9f \ - ureadc.9f \ - usb_alloc_request.9f \ - usb_client_attach.9f \ - usb_clr_feature.9f \ - usb_create_pm_components.9f \ + pollwakeup.9f \ + priv_getbyname.9f \ + priv_policy.9f \ + proc_signal.9f \ + ptob.9f \ + pullupmsg.9f \ + put.9f \ + putbq.9f \ + putctl.9f \ + putctl1.9f \ + putnext.9f \ + putnextctl.9f \ + putnextctl1.9f \ + putq.9f \ + qassociate.9f \ + qbufcall.9f \ + qenable.9f \ + qprocson.9f \ + qreply.9f \ + qsize.9f \ + qtimeout.9f \ + qunbufcall.9f \ + quntimeout.9f \ + qwait.9f \ + qwriter.9f \ + rmalloc.9f \ + rmalloc_wait.9f \ + rmallocmap.9f \ + rmfree.9f \ + rmvb.9f \ + rmvq.9f \ + rwlock.9f \ + scsi_abort.9f \ + scsi_alloc_consistent_buf.9f \ + scsi_cname.9f \ + scsi_destroy_pkt.9f \ + scsi_dmaget.9f \ + scsi_errmsg.9f \ + scsi_ext_sense_fields.9f \ + scsi_find_sense_descr.9f \ + scsi_free_consistent_buf.9f \ + scsi_get_device_type_scsi_options.9f \ + scsi_get_device_type_string.9f \ + scsi_hba_attach_setup.9f \ + scsi_hba_init.9f \ + scsi_hba_lookup_capstr.9f \ + scsi_hba_pkt_alloc.9f \ + scsi_hba_pkt_comp.9f \ + scsi_hba_probe.9f \ + scsi_hba_tran_alloc.9f \ + scsi_ifgetcap.9f \ + scsi_init_pkt.9f \ + scsi_log.9f \ + scsi_pktalloc.9f \ + scsi_poll.9f \ + scsi_probe.9f \ + scsi_reset.9f \ + scsi_reset_notify.9f \ + scsi_sense_key.9f \ + scsi_setup_cdb.9f \ + scsi_slave.9f \ + scsi_sync_pkt.9f \ + scsi_transport.9f \ + scsi_unprobe.9f \ + scsi_validate_sense.9f \ + scsi_vu_errmsg.9f \ + semaphore.9f \ + sprintf.9f \ + stoi.9f \ + string.9f \ + strlog.9f \ + strqget.9f \ + strqset.9f \ + swab.9f \ + taskq.9f \ + testb.9f \ + timeout.9f \ + u8_strcmp.9f \ + u8_textprep_str.9f \ + u8_validate.9f \ + uconv_u16tou32.9f \ + uiomove.9f \ + unbufcall.9f \ + unlinkb.9f \ + untimeout.9f \ + ureadc.9f \ + usb_alloc_request.9f \ + usb_client_attach.9f \ + usb_clr_feature.9f \ + usb_create_pm_components.9f \ usb_ep_xdescr_fill.9f \ - usb_get_addr.9f \ - usb_get_alt_if.9f \ - usb_get_cfg.9f \ - usb_get_current_frame_number.9f \ - usb_get_dev_data.9f \ - usb_get_max_pkts_per_isoc_request.9f \ - usb_get_status.9f \ - usb_get_string_descr.9f \ - usb_handle_remote_wakeup.9f \ - usb_lookup_ep_data.9f \ - usb_parse_data.9f \ - usb_pipe_bulk_xfer.9f \ - usb_pipe_close.9f \ - usb_pipe_ctrl_xfer.9f \ - usb_pipe_drain_reqs.9f \ - usb_pipe_get_max_bulk_transfer_size.9f \ - usb_pipe_get_state.9f \ - usb_pipe_intr_xfer.9f \ - usb_pipe_isoc_xfer.9f \ + usb_get_addr.9f \ + usb_get_alt_if.9f \ + usb_get_cfg.9f \ + usb_get_current_frame_number.9f \ + usb_get_dev_data.9f \ + usb_get_max_pkts_per_isoc_request.9f \ + usb_get_status.9f \ + usb_get_string_descr.9f \ + usb_handle_remote_wakeup.9f \ + usb_lookup_ep_data.9f \ + usb_parse_data.9f \ + usb_pipe_bulk_xfer.9f \ + usb_pipe_close.9f \ + usb_pipe_ctrl_xfer.9f \ + usb_pipe_drain_reqs.9f \ + usb_pipe_get_max_bulk_transfer_size.9f \ + usb_pipe_get_state.9f \ + usb_pipe_intr_xfer.9f \ + usb_pipe_isoc_xfer.9f \ usb_pipe_xopen.9f \ - usb_pipe_reset.9f \ - usb_pipe_set_private.9f \ - usb_register_hotplug_cbs.9f \ - usb_reset_device.9f \ - uwritec.9f \ - va_arg.9f \ - vsprintf.9f - -MANLINKS= SIZEOF_PTR.9f \ - SIZEOF_STRUCT.9f \ - STRUCT_BUF.9f \ - STRUCT_FADDR.9f \ - STRUCT_FGET.9f \ - STRUCT_FGETP.9f \ - STRUCT_FSET.9f \ - STRUCT_FSETP.9f \ - STRUCT_HANDLE.9f \ - STRUCT_INIT.9f \ - STRUCT_SET_HANDLE.9f \ - STRUCT_SIZE.9f \ - assert.9f \ - atomic_add_16.9f \ - atomic_add_16_nv.9f \ - atomic_add_32.9f \ - atomic_add_32_nv.9f \ - atomic_add_64.9f \ - atomic_add_64_nv.9f \ - atomic_add_8.9f \ - atomic_add_8_nv.9f \ - atomic_add_char.9f \ - atomic_add_char_nv.9f \ - atomic_add_int.9f \ - atomic_add_int_nv.9f \ - atomic_add_long.9f \ - atomic_add_long_nv.9f \ - atomic_add_ptr.9f \ - atomic_add_ptr_nv.9f \ - atomic_add_short.9f \ - atomic_add_short_nv.9f \ - atomic_and_16.9f \ - atomic_and_16_nv.9f \ - atomic_and_32.9f \ - atomic_and_32_nv.9f \ - atomic_and_64.9f \ - atomic_and_64_nv.9f \ - atomic_and_8.9f \ - atomic_and_8_nv.9f \ - atomic_and_uchar.9f \ - atomic_and_uchar_nv.9f \ - atomic_and_uint.9f \ - atomic_and_uint_nv.9f \ - atomic_and_ulong.9f \ - atomic_and_ulong_nv.9f \ - atomic_and_ushort.9f \ - atomic_and_ushort_nv.9f \ - atomic_cas_16.9f \ - atomic_cas_32.9f \ - atomic_cas_64.9f \ - atomic_cas_8.9f \ - atomic_cas_ptr.9f \ - atomic_cas_uchar.9f \ - atomic_cas_uint.9f \ - atomic_cas_ulong.9f \ - atomic_cas_ushort.9f \ - atomic_clear_long_excl.9f \ - atomic_dec_16.9f \ - atomic_dec_16_nv.9f \ - atomic_dec_32.9f \ - atomic_dec_32_nv.9f \ - atomic_dec_64.9f \ - atomic_dec_64_nv.9f \ - atomic_dec_8.9f \ - atomic_dec_8_nv.9f \ - atomic_dec_ptr.9f \ - atomic_dec_ptr_nv.9f \ - atomic_dec_uchar.9f \ - atomic_dec_uchar_nv.9f \ - atomic_dec_uint.9f \ - atomic_dec_uint_nv.9f \ - atomic_dec_ulong.9f \ - atomic_dec_ulong_nv.9f \ - atomic_dec_ushort.9f \ - atomic_dec_ushort_nv.9f \ - atomic_inc_16.9f \ - atomic_inc_16_nv.9f \ - atomic_inc_32.9f \ - atomic_inc_32_nv.9f \ - atomic_inc_64.9f \ - atomic_inc_64_nv.9f \ - atomic_inc_8.9f \ - atomic_inc_8_nv.9f \ - atomic_inc_ptr.9f \ - atomic_inc_ptr_nv.9f \ - atomic_inc_uchar.9f \ - atomic_inc_uchar_nv.9f \ - atomic_inc_uint.9f \ - atomic_inc_uint_nv.9f \ - atomic_inc_ulong.9f \ - atomic_inc_ulong_nv.9f \ - atomic_inc_ushort.9f \ - atomic_inc_ushort_nv.9f \ - atomic_or_16.9f \ - atomic_or_16_nv.9f \ - atomic_or_32.9f \ - atomic_or_32_nv.9f \ - atomic_or_64.9f \ - atomic_or_64_nv.9f \ - atomic_or_8.9f \ - atomic_or_8_nv.9f \ - atomic_or_uchar.9f \ - atomic_or_uchar_nv.9f \ - atomic_or_uint.9f \ - atomic_or_uint_nv.9f \ - atomic_or_ulong.9f \ - atomic_or_ulong_nv.9f \ - atomic_or_ushort.9f \ - atomic_or_ushort_nv.9f \ - atomic_set_long_excl.9f \ - atomic_swap_16.9f \ - atomic_swap_32.9f \ - atomic_swap_64.9f \ - atomic_swap_8.9f \ - atomic_swap_ptr.9f \ - atomic_swap_uchar.9f \ - atomic_swap_uint.9f \ - atomic_swap_ulong.9f \ - atomic_swap_ushort.9f \ + usb_pipe_reset.9f \ + usb_pipe_set_private.9f \ + usb_register_hotplug_cbs.9f \ + usb_reset_device.9f \ + uwritec.9f \ + va_arg.9f + +MANLINKS= AVL_NEXT.9f \ + AVL_PREV.9f \ + SIZEOF_PTR.9f \ + SIZEOF_STRUCT.9f \ + STRUCT_BUF.9f \ + STRUCT_FADDR.9f \ + STRUCT_FGET.9f \ + STRUCT_FGETP.9f \ + STRUCT_FSET.9f \ + STRUCT_FSETP.9f \ + STRUCT_HANDLE.9f \ + STRUCT_INIT.9f \ + STRUCT_SET_HANDLE.9f \ + STRUCT_SIZE.9f \ + assert.9f \ + atomic_add_16.9f \ + atomic_add_16_nv.9f \ + atomic_add_32.9f \ + atomic_add_32_nv.9f \ + atomic_add_64.9f \ + atomic_add_64_nv.9f \ + atomic_add_8.9f \ + atomic_add_8_nv.9f \ + atomic_add_char.9f \ + atomic_add_char_nv.9f \ + atomic_add_int.9f \ + atomic_add_int_nv.9f \ + atomic_add_long.9f \ + atomic_add_long_nv.9f \ + atomic_add_ptr.9f \ + atomic_add_ptr_nv.9f \ + atomic_add_short.9f \ + atomic_add_short_nv.9f \ + atomic_and_16.9f \ + atomic_and_16_nv.9f \ + atomic_and_32.9f \ + atomic_and_32_nv.9f \ + atomic_and_64.9f \ + atomic_and_64_nv.9f \ + atomic_and_8.9f \ + atomic_and_8_nv.9f \ + atomic_and_uchar.9f \ + atomic_and_uchar_nv.9f \ + atomic_and_uint.9f \ + atomic_and_uint_nv.9f \ + atomic_and_ulong.9f \ + atomic_and_ulong_nv.9f \ + atomic_and_ushort.9f \ + atomic_and_ushort_nv.9f \ + atomic_cas_16.9f \ + atomic_cas_32.9f \ + atomic_cas_64.9f \ + atomic_cas_8.9f \ + atomic_cas_ptr.9f \ + atomic_cas_uchar.9f \ + atomic_cas_uint.9f \ + atomic_cas_ulong.9f \ + atomic_cas_ushort.9f \ + atomic_clear_long_excl.9f \ + atomic_dec_16.9f \ + atomic_dec_16_nv.9f \ + atomic_dec_32.9f \ + atomic_dec_32_nv.9f \ + atomic_dec_64.9f \ + atomic_dec_64_nv.9f \ + atomic_dec_8.9f \ + atomic_dec_8_nv.9f \ + atomic_dec_ptr.9f \ + atomic_dec_ptr_nv.9f \ + atomic_dec_uchar.9f \ + atomic_dec_uchar_nv.9f \ + atomic_dec_uint.9f \ + atomic_dec_uint_nv.9f \ + atomic_dec_ulong.9f \ + atomic_dec_ulong_nv.9f \ + atomic_dec_ushort.9f \ + atomic_dec_ushort_nv.9f \ + atomic_inc_16.9f \ + atomic_inc_16_nv.9f \ + atomic_inc_32.9f \ + atomic_inc_32_nv.9f \ + atomic_inc_64.9f \ + atomic_inc_64_nv.9f \ + atomic_inc_8.9f \ + atomic_inc_8_nv.9f \ + atomic_inc_ptr.9f \ + atomic_inc_ptr_nv.9f \ + atomic_inc_uchar.9f \ + atomic_inc_uchar_nv.9f \ + atomic_inc_uint.9f \ + atomic_inc_uint_nv.9f \ + atomic_inc_ulong.9f \ + atomic_inc_ulong_nv.9f \ + atomic_inc_ushort.9f \ + atomic_inc_ushort_nv.9f \ + atomic_or_16.9f \ + atomic_or_16_nv.9f \ + atomic_or_32.9f \ + atomic_or_32_nv.9f \ + atomic_or_64.9f \ + atomic_or_64_nv.9f \ + atomic_or_8.9f \ + atomic_or_8_nv.9f \ + atomic_or_uchar.9f \ + atomic_or_uchar_nv.9f \ + atomic_or_uint.9f \ + atomic_or_uint_nv.9f \ + atomic_or_ulong.9f \ + atomic_or_ulong_nv.9f \ + atomic_or_ushort.9f \ + atomic_or_ushort_nv.9f \ + atomic_set_long_excl.9f \ + atomic_swap_16.9f \ + atomic_swap_32.9f \ + atomic_swap_64.9f \ + atomic_swap_8.9f \ + atomic_swap_ptr.9f \ + atomic_swap_uchar.9f \ + atomic_swap_uint.9f \ + atomic_swap_ulong.9f \ + atomic_swap_ushort.9f \ avl_add.9f \ avl_create.9f \ avl_destroy.9f \ @@ -660,572 +662,573 @@ MANLINKS= SIZEOF_PTR.9f \ avl_numnodes.9f \ avl_remove.9f \ avl_swap.9f \ - AVL_NEXT.9f \ - AVL_PREV.9f \ - bcanputnext.9f \ - crgetgid.9f \ - crgetgroups.9f \ - crgetngroups.9f \ - crgetrgid.9f \ - crgetruid.9f \ - crgetsgid.9f \ - crgetsuid.9f \ - crgetuid.9f \ - crgetzoneid.9f \ - csx_Get16.9f \ - csx_Get32.9f \ - csx_Get64.9f \ - csx_GetEventMask.9f \ - csx_GetNextClient.9f \ - csx_GetNextTuple.9f \ - csx_Parse_CISTPL_DEVICE_A.9f \ - csx_Parse_CISTPL_DEVICE_OA.9f \ - csx_Parse_CISTPL_DEVICE_OC.9f \ - csx_Parse_CISTPL_JEDEC_A.9f \ - csx_Parse_CISTPL_LONGLINK_C.9f \ - csx_Put16.9f \ - csx_Put32.9f \ - csx_Put64.9f \ - csx_ReleaseIO.9f \ - csx_ReleaseIRQ.9f \ - csx_ReleaseSocketMask.9f \ - csx_ReleaseWindow.9f \ - csx_RemoveDeviceNode.9f \ - csx_RepGet16.9f \ - csx_RepGet32.9f \ - csx_RepGet64.9f \ - csx_RepPut16.9f \ - csx_RepPut32.9f \ - csx_RepPut64.9f \ - cv_broadcast.9f \ - cv_destroy.9f \ - cv_init.9f \ - cv_reltimedwait.9f \ - cv_reltimedwait_sig.9f \ - cv_signal.9f \ - cv_timedwait.9f \ - cv_timedwait_sig.9f \ - cv_wait.9f \ - cv_wait_sig.9f \ - ddi_btopr.9f \ - ddi_cb_unregister.9f \ - ddi_check_dma_handle.9f \ - ddi_devid_free.9f \ - ddi_devid_get.9f \ - ddi_devid_init.9f \ - ddi_devid_register.9f \ - ddi_devid_sizeof.9f \ - ddi_devid_str_decode.9f \ - ddi_devid_str_encode.9f \ - ddi_devid_str_free.9f \ - ddi_devid_unregister.9f \ - ddi_devid_valid.9f \ - ddi_devmap_segmap.9f \ - ddi_dmae_1stparty.9f \ - ddi_dmae_alloc.9f \ - ddi_dmae_disable.9f \ - ddi_dmae_enable.9f \ - ddi_dmae_getattr.9f \ - ddi_dmae_getcnt.9f \ - ddi_dmae_prog.9f \ - ddi_dmae_release.9f \ - ddi_dmae_stop.9f \ - ddi_exit_critical.9f \ - ddi_fls.9f \ - ddi_fm_capable.9f \ - ddi_fm_dma_err_clear.9f \ - ddi_fm_dma_err_get.9f \ - ddi_fm_fini.9f \ - ddi_fm_handler_unregister.9f \ - ddi_get16.9f \ - ddi_get32.9f \ - ddi_get64.9f \ - ddi_get_iblock_cookie.9f \ - ddi_get_lbolt64.9f \ - ddi_get_name.9f \ - ddi_get_soft_iblock_cookie.9f \ - ddi_get_soft_state.9f \ - ddi_getb.9f \ - ddi_getl.9f \ - ddi_getll.9f \ - ddi_getlongprop.9f \ - ddi_getlongprop_buf.9f \ - ddi_getprop.9f \ - ddi_getproplen.9f \ - ddi_getw.9f \ - ddi_intr_block_disable.9f \ - ddi_intr_block_enable.9f \ - ddi_intr_clr_mask.9f \ - ddi_intr_disable.9f \ - ddi_intr_free.9f \ - ddi_intr_get_navail.9f \ - ddi_intr_get_softint_pri.9f \ - ddi_intr_remove_handler.9f \ - ddi_intr_remove_softint.9f \ - ddi_intr_set_cap.9f \ - ddi_intr_set_pri.9f \ - ddi_intr_set_softint_pri.9f \ - ddi_intr_trigger_softint.9f \ - ddi_io_get16.9f \ - ddi_io_get32.9f \ - ddi_io_getb.9f \ - ddi_io_getl.9f \ - ddi_io_getw.9f \ - ddi_io_put16.9f \ - ddi_io_put32.9f \ - ddi_io_putb.9f \ - ddi_io_putl.9f \ - ddi_io_putw.9f \ - ddi_io_rep_get16.9f \ - ddi_io_rep_get32.9f \ - ddi_io_rep_getb.9f \ - ddi_io_rep_getl.9f \ - ddi_io_rep_getw.9f \ - ddi_io_rep_put16.9f \ - ddi_io_rep_put32.9f \ - ddi_io_rep_putb.9f \ - ddi_io_rep_putl.9f \ - ddi_io_rep_putw.9f \ - ddi_mem_get16.9f \ - ddi_mem_get32.9f \ - ddi_mem_get64.9f \ - ddi_mem_getb.9f \ - ddi_mem_getl.9f \ - ddi_mem_getll.9f \ - ddi_mem_getw.9f \ - ddi_mem_put16.9f \ - ddi_mem_put32.9f \ - ddi_mem_put64.9f \ - ddi_mem_putb.9f \ - ddi_mem_putl.9f \ - ddi_mem_putll.9f \ - ddi_mem_putw.9f \ - ddi_mem_rep_get16.9f \ - ddi_mem_rep_get32.9f \ - ddi_mem_rep_get64.9f \ - ddi_mem_rep_getb.9f \ - ddi_mem_rep_getl.9f \ - ddi_mem_rep_getll.9f \ - ddi_mem_rep_getw.9f \ - ddi_mem_rep_put16.9f \ - ddi_mem_rep_put32.9f \ - ddi_mem_rep_put64.9f \ - ddi_mem_rep_putb.9f \ - ddi_mem_rep_putl.9f \ - ddi_mem_rep_putll.9f \ - ddi_mem_rep_putw.9f \ - ddi_modclose.9f \ - ddi_modsym.9f \ - ddi_peek16.9f \ - ddi_peek32.9f \ - ddi_peek64.9f \ - ddi_peek8.9f \ - ddi_peekc.9f \ - ddi_peekd.9f \ - ddi_peekl.9f \ - ddi_peeks.9f \ - ddi_poke16.9f \ - ddi_poke32.9f \ - ddi_poke64.9f \ - ddi_poke8.9f \ - ddi_pokec.9f \ - ddi_poked.9f \ - ddi_pokel.9f \ - ddi_pokes.9f \ - ddi_prop_free.9f \ - ddi_prop_get_int64.9f \ - ddi_prop_lookup_byte_array.9f \ - ddi_prop_lookup_int64_array.9f \ - ddi_prop_lookup_int_array.9f \ - ddi_prop_lookup_string.9f \ - ddi_prop_lookup_string_array.9f \ - ddi_prop_modify.9f \ - ddi_prop_remove.9f \ - ddi_prop_remove_all.9f \ - ddi_prop_undefine.9f \ - ddi_prop_update_byte_array.9f \ - ddi_prop_update_int.9f \ - ddi_prop_update_int64.9f \ - ddi_prop_update_int64_array.9f \ - ddi_prop_update_int_array.9f \ - ddi_prop_update_string.9f \ - ddi_prop_update_string_array.9f \ - ddi_ptob.9f \ - ddi_put16.9f \ - ddi_put32.9f \ - ddi_put64.9f \ - ddi_putb.9f \ - ddi_putl.9f \ - ddi_putll.9f \ - ddi_putw.9f \ - ddi_remove_intr.9f \ - ddi_remove_softintr.9f \ - ddi_rep_get16.9f \ - ddi_rep_get32.9f \ - ddi_rep_get64.9f \ - ddi_rep_getb.9f \ - ddi_rep_getl.9f \ - ddi_rep_getll.9f \ - ddi_rep_getw.9f \ - ddi_rep_put16.9f \ - ddi_rep_put32.9f \ - ddi_rep_put64.9f \ - ddi_rep_putb.9f \ - ddi_rep_putl.9f \ - ddi_rep_putll.9f \ - ddi_rep_putw.9f \ - ddi_segmap_setup.9f \ - ddi_set_driver_private.9f \ - ddi_soft_state_fini.9f \ - ddi_soft_state_free.9f \ - ddi_soft_state_init.9f \ - ddi_soft_state_zalloc.9f \ - ddi_strdup.9f \ - ddi_strtoull.9f \ - ddi_taskq_create.9f \ - ddi_taskq_destroy.9f \ - ddi_taskq_dispatch.9f \ - ddi_taskq_resume.9f \ - ddi_taskq_suspend.9f \ - ddi_taskq_wait.9f \ - ddi_trigger_softintr.9f \ - ddi_umem_free.9f \ - ddi_umem_unlock.9f \ - ddi_unmap_regs.9f \ - desballoc.9f \ - dev_err.9f \ - devmap_load.9f \ - devmap_umem_setup.9f \ - dlerrorack.9f \ - dlokack.9f \ - dlphysaddrack.9f \ - dluderrorind.9f \ + bcanputnext.9f \ + crgetgid.9f \ + crgetgroups.9f \ + crgetngroups.9f \ + crgetrgid.9f \ + crgetruid.9f \ + crgetsgid.9f \ + crgetsuid.9f \ + crgetuid.9f \ + crgetzoneid.9f \ + csx_Get16.9f \ + csx_Get32.9f \ + csx_Get64.9f \ + csx_GetEventMask.9f \ + csx_GetNextClient.9f \ + csx_GetNextTuple.9f \ + csx_Parse_CISTPL_DEVICE_A.9f \ + csx_Parse_CISTPL_DEVICE_OA.9f \ + csx_Parse_CISTPL_DEVICE_OC.9f \ + csx_Parse_CISTPL_JEDEC_A.9f \ + csx_Parse_CISTPL_LONGLINK_C.9f \ + csx_Put16.9f \ + csx_Put32.9f \ + csx_Put64.9f \ + csx_ReleaseIO.9f \ + csx_ReleaseIRQ.9f \ + csx_ReleaseSocketMask.9f \ + csx_ReleaseWindow.9f \ + csx_RemoveDeviceNode.9f \ + csx_RepGet16.9f \ + csx_RepGet32.9f \ + csx_RepGet64.9f \ + csx_RepPut16.9f \ + csx_RepPut32.9f \ + csx_RepPut64.9f \ + cv_broadcast.9f \ + cv_destroy.9f \ + cv_init.9f \ + cv_reltimedwait.9f \ + cv_reltimedwait_sig.9f \ + cv_signal.9f \ + cv_timedwait.9f \ + cv_timedwait_sig.9f \ + cv_wait.9f \ + cv_wait_sig.9f \ + ddi_btopr.9f \ + ddi_cb_unregister.9f \ + ddi_check_dma_handle.9f \ + ddi_devid_free.9f \ + ddi_devid_get.9f \ + ddi_devid_init.9f \ + ddi_devid_register.9f \ + ddi_devid_sizeof.9f \ + ddi_devid_str_decode.9f \ + ddi_devid_str_encode.9f \ + ddi_devid_str_free.9f \ + ddi_devid_unregister.9f \ + ddi_devid_valid.9f \ + ddi_devmap_segmap.9f \ + ddi_dmae_1stparty.9f \ + ddi_dmae_alloc.9f \ + ddi_dmae_disable.9f \ + ddi_dmae_enable.9f \ + ddi_dmae_getattr.9f \ + ddi_dmae_getcnt.9f \ + ddi_dmae_prog.9f \ + ddi_dmae_release.9f \ + ddi_dmae_stop.9f \ + ddi_exit_critical.9f \ + ddi_fls.9f \ + ddi_fm_capable.9f \ + ddi_fm_dma_err_clear.9f \ + ddi_fm_dma_err_get.9f \ + ddi_fm_fini.9f \ + ddi_fm_handler_unregister.9f \ + ddi_get16.9f \ + ddi_get32.9f \ + ddi_get64.9f \ + ddi_get_iblock_cookie.9f \ + ddi_get_lbolt64.9f \ + ddi_get_name.9f \ + ddi_get_soft_iblock_cookie.9f \ + ddi_get_soft_state.9f \ + ddi_getb.9f \ + ddi_getl.9f \ + ddi_getll.9f \ + ddi_getlongprop.9f \ + ddi_getlongprop_buf.9f \ + ddi_getprop.9f \ + ddi_getproplen.9f \ + ddi_getw.9f \ + ddi_intr_block_disable.9f \ + ddi_intr_block_enable.9f \ + ddi_intr_clr_mask.9f \ + ddi_intr_disable.9f \ + ddi_intr_free.9f \ + ddi_intr_get_navail.9f \ + ddi_intr_get_softint_pri.9f \ + ddi_intr_remove_handler.9f \ + ddi_intr_remove_softint.9f \ + ddi_intr_set_cap.9f \ + ddi_intr_set_pri.9f \ + ddi_intr_set_softint_pri.9f \ + ddi_intr_trigger_softint.9f \ + ddi_io_get16.9f \ + ddi_io_get32.9f \ + ddi_io_getb.9f \ + ddi_io_getl.9f \ + ddi_io_getw.9f \ + ddi_io_put16.9f \ + ddi_io_put32.9f \ + ddi_io_putb.9f \ + ddi_io_putl.9f \ + ddi_io_putw.9f \ + ddi_io_rep_get16.9f \ + ddi_io_rep_get32.9f \ + ddi_io_rep_getb.9f \ + ddi_io_rep_getl.9f \ + ddi_io_rep_getw.9f \ + ddi_io_rep_put16.9f \ + ddi_io_rep_put32.9f \ + ddi_io_rep_putb.9f \ + ddi_io_rep_putl.9f \ + ddi_io_rep_putw.9f \ + ddi_mem_get16.9f \ + ddi_mem_get32.9f \ + ddi_mem_get64.9f \ + ddi_mem_getb.9f \ + ddi_mem_getl.9f \ + ddi_mem_getll.9f \ + ddi_mem_getw.9f \ + ddi_mem_put16.9f \ + ddi_mem_put32.9f \ + ddi_mem_put64.9f \ + ddi_mem_putb.9f \ + ddi_mem_putl.9f \ + ddi_mem_putll.9f \ + ddi_mem_putw.9f \ + ddi_mem_rep_get16.9f \ + ddi_mem_rep_get32.9f \ + ddi_mem_rep_get64.9f \ + ddi_mem_rep_getb.9f \ + ddi_mem_rep_getl.9f \ + ddi_mem_rep_getll.9f \ + ddi_mem_rep_getw.9f \ + ddi_mem_rep_put16.9f \ + ddi_mem_rep_put32.9f \ + ddi_mem_rep_put64.9f \ + ddi_mem_rep_putb.9f \ + ddi_mem_rep_putl.9f \ + ddi_mem_rep_putll.9f \ + ddi_mem_rep_putw.9f \ + ddi_modclose.9f \ + ddi_modsym.9f \ + ddi_peek16.9f \ + ddi_peek32.9f \ + ddi_peek64.9f \ + ddi_peek8.9f \ + ddi_peekc.9f \ + ddi_peekd.9f \ + ddi_peekl.9f \ + ddi_peeks.9f \ + ddi_poke16.9f \ + ddi_poke32.9f \ + ddi_poke64.9f \ + ddi_poke8.9f \ + ddi_pokec.9f \ + ddi_poked.9f \ + ddi_pokel.9f \ + ddi_pokes.9f \ + ddi_prop_free.9f \ + ddi_prop_get_int64.9f \ + ddi_prop_lookup_byte_array.9f \ + ddi_prop_lookup_int64_array.9f \ + ddi_prop_lookup_int_array.9f \ + ddi_prop_lookup_string.9f \ + ddi_prop_lookup_string_array.9f \ + ddi_prop_modify.9f \ + ddi_prop_remove.9f \ + ddi_prop_remove_all.9f \ + ddi_prop_undefine.9f \ + ddi_prop_update_byte_array.9f \ + ddi_prop_update_int.9f \ + ddi_prop_update_int64.9f \ + ddi_prop_update_int64_array.9f \ + ddi_prop_update_int_array.9f \ + ddi_prop_update_string.9f \ + ddi_prop_update_string_array.9f \ + ddi_ptob.9f \ + ddi_put16.9f \ + ddi_put32.9f \ + ddi_put64.9f \ + ddi_putb.9f \ + ddi_putl.9f \ + ddi_putll.9f \ + ddi_putw.9f \ + ddi_remove_intr.9f \ + ddi_remove_softintr.9f \ + ddi_rep_get16.9f \ + ddi_rep_get32.9f \ + ddi_rep_get64.9f \ + ddi_rep_getb.9f \ + ddi_rep_getl.9f \ + ddi_rep_getll.9f \ + ddi_rep_getw.9f \ + ddi_rep_put16.9f \ + ddi_rep_put32.9f \ + ddi_rep_put64.9f \ + ddi_rep_putb.9f \ + ddi_rep_putl.9f \ + ddi_rep_putll.9f \ + ddi_rep_putw.9f \ + ddi_segmap_setup.9f \ + ddi_set_driver_private.9f \ + ddi_soft_state_fini.9f \ + ddi_soft_state_free.9f \ + ddi_soft_state_init.9f \ + ddi_soft_state_zalloc.9f \ + ddi_strdup.9f \ + ddi_strtoull.9f \ + ddi_taskq_create.9f \ + ddi_taskq_destroy.9f \ + ddi_taskq_dispatch.9f \ + ddi_taskq_resume.9f \ + ddi_taskq_suspend.9f \ + ddi_taskq_wait.9f \ + ddi_trigger_softintr.9f \ + ddi_umem_free.9f \ + ddi_umem_unlock.9f \ + ddi_unmap_regs.9f \ + desballoc.9f \ + dev_err.9f \ + devmap_load.9f \ + devmap_umem_setup.9f \ + dlerrorack.9f \ + dlokack.9f \ + dlphysaddrack.9f \ + dluderrorind.9f \ firmware_close.9f \ firmware_free.9f \ firmware_get_size.9f \ firmware_malloc.9f \ firmware_open.9f \ firmware_read.9f \ - free_pktiopb.9f \ - gld_intr.9f \ - gld_mac_alloc.9f \ - gld_mac_free.9f \ - gld_recv.9f \ - gld_register.9f \ - gld_sched.9f \ - gld_unregister.9f \ - id_space_create.9f \ - id_space_destroy.9f \ - id_space_extend.9f \ + free_pktiopb.9f \ + gld_intr.9f \ + gld_mac_alloc.9f \ + gld_mac_free.9f \ + gld_recv.9f \ + gld_register.9f \ + gld_sched.9f \ + gld_unregister.9f \ + id32_free.9f \ + id32_lookup.9f \ id_alloc.9f \ id_alloc_nosleep.9f \ + id_alloc_specific_nosleep.9f \ id_allocff.9f \ id_allocff_nosleep.9f \ - id_alloc_specific_nosleep.9f \ id_free.9f \ - id32_free.9f \ - id32_lookup.9f \ - inl.9f \ - intro.9f \ - inw.9f \ - kmem_cache_alloc.9f \ - kmem_cache_destroy.9f \ - kmem_cache_free.9f \ - kmem_cache_set_move.9f \ - kmem_free.9f \ - kmem_zalloc.9f \ - kstat_named_setstr.9f \ - kstat_runq_back_to_waitq.9f \ - kstat_runq_enter.9f \ - kstat_runq_exit.9f \ - kstat_waitq_enter.9f \ - kstat_waitq_exit.9f \ - kstat_waitq_to_runq.9f \ - ldi_awrite.9f \ - ldi_close.9f \ - ldi_get_devid.9f \ - ldi_get_minor_name.9f \ - ldi_get_otyp.9f \ - ldi_getmsg.9f \ - ldi_ident_from_dip.9f \ - ldi_ident_from_stream.9f \ - ldi_ident_release.9f \ - ldi_open_by_devid.9f \ - ldi_open_by_name.9f \ - ldi_prop_get_int64.9f \ - ldi_prop_lookup_byte_array.9f \ - ldi_prop_lookup_int64_array.9f \ - ldi_prop_lookup_string.9f \ - ldi_prop_lookup_string_array.9f \ - ldi_write.9f \ - list_destroy.9f \ - list_head.9f \ - list_insert_after.9f \ - list_insert_before.9f \ - list_insert_head.9f \ - list_insert_tail.9f \ - list_is_empty.9f \ - list_link_active.9f \ - list_link_init.9f \ - list_link_replace.9f \ - list_move_tail.9f \ - list_next.9f \ - list_prev.9f \ - list_remove.9f \ - list_remove_head.9f \ - list_remove_tail.9f \ - list_tail.9f \ + id_space_create.9f \ + id_space_destroy.9f \ + id_space_extend.9f \ + inl.9f \ + intro.9f \ + inw.9f \ + kmem_cache_alloc.9f \ + kmem_cache_destroy.9f \ + kmem_cache_free.9f \ + kmem_cache_set_move.9f \ + kmem_free.9f \ + kmem_zalloc.9f \ + kstat_named_setstr.9f \ + kstat_runq_back_to_waitq.9f \ + kstat_runq_enter.9f \ + kstat_runq_exit.9f \ + kstat_waitq_enter.9f \ + kstat_waitq_exit.9f \ + kstat_waitq_to_runq.9f \ + ldi_awrite.9f \ + ldi_close.9f \ + ldi_get_devid.9f \ + ldi_get_minor_name.9f \ + ldi_get_otyp.9f \ + ldi_getmsg.9f \ + ldi_ident_from_dip.9f \ + ldi_ident_from_stream.9f \ + ldi_ident_release.9f \ + ldi_open_by_devid.9f \ + ldi_open_by_name.9f \ + ldi_prop_get_int64.9f \ + ldi_prop_lookup_byte_array.9f \ + ldi_prop_lookup_int64_array.9f \ + ldi_prop_lookup_string.9f \ + ldi_prop_lookup_string_array.9f \ + ldi_write.9f \ + list_destroy.9f \ + list_head.9f \ + list_insert_after.9f \ + list_insert_before.9f \ + list_insert_head.9f \ + list_insert_tail.9f \ + list_is_empty.9f \ + list_link_active.9f \ + list_link_init.9f \ + list_link_replace.9f \ + list_move_tail.9f \ + list_next.9f \ + list_prev.9f \ + list_remove.9f \ + list_remove_head.9f \ + list_remove_tail.9f \ + list_tail.9f \ + mac_fini_ops.9f \ mac_free.9f \ mac_hcksum_set.9f \ - mac_fini_ops.9f \ mac_prop_info_set_default_link_flowctrl.9f \ mac_prop_info_set_default_str.9f \ - mac_prop_info_set_default_uint8.9f \ mac_prop_info_set_default_uint32.9f \ mac_prop_info_set_default_uint64.9f \ + mac_prop_info_set_default_uint8.9f \ mac_prop_info_set_perm.9f \ mac_prop_info_set_range_uint32.9f \ mac_unregister.9f \ - makecom_g0.9f \ - makecom_g0_s.9f \ - makecom_g1.9f \ - makecom_g5.9f \ - membar_consumer.9f \ - membar_enter.9f \ - membar_exit.9f \ - membar_producer.9f \ - memcmp.9f \ - memcpy.9f \ - memmove.9f \ - memset.9f \ - minphys.9f \ - mod_info.9f \ - mod_modname.9f \ - mod_remove.9f \ - mutex_destroy.9f \ - mutex_enter.9f \ - mutex_exit.9f \ - mutex_init.9f \ - mutex_owned.9f \ - mutex_tryenter.9f \ - net_event_notify_unregister.9f \ - net_instance_notify_unregister.9f \ - net_instance_protocol_unregister.9f \ - numtos.9f \ - nv_alloc_fini.9f \ - nv_alloc_init.9f \ - nvlist_add_boolean_array.9f \ - nvlist_add_boolean_value.9f \ - nvlist_add_byte.9f \ - nvlist_add_byte_array.9f \ - nvlist_add_int16.9f \ - nvlist_add_int16_array.9f \ - nvlist_add_int32.9f \ - nvlist_add_int32_array.9f \ - nvlist_add_int64.9f \ - nvlist_add_int64_array.9f \ - nvlist_add_int8.9f \ - nvlist_add_int8_array.9f \ - nvlist_add_nvlist.9f \ - nvlist_add_nvlist_array.9f \ - nvlist_add_nvpair.9f \ - nvlist_add_string.9f \ - nvlist_add_string_array.9f \ - nvlist_add_uint16.9f \ - nvlist_add_uint16_array.9f \ - nvlist_add_uint32.9f \ - nvlist_add_uint32_array.9f \ - nvlist_add_uint64.9f \ - nvlist_add_uint64_array.9f \ - nvlist_add_uint8.9f \ - nvlist_add_uint8_array.9f \ - nvlist_dup.9f \ - nvlist_exists.9f \ - nvlist_free.9f \ - nvlist_lookup_boolean_array.9f \ - nvlist_lookup_boolean_value.9f \ - nvlist_lookup_byte.9f \ - nvlist_lookup_byte_array.9f \ - nvlist_lookup_int16.9f \ - nvlist_lookup_int16_array.9f \ - nvlist_lookup_int32.9f \ - nvlist_lookup_int32_array.9f \ - nvlist_lookup_int64.9f \ - nvlist_lookup_int64_array.9f \ - nvlist_lookup_int8.9f \ - nvlist_lookup_int8_array.9f \ - nvlist_lookup_nvlist.9f \ - nvlist_lookup_nvlist_array.9f \ - nvlist_lookup_pairs.9f \ - nvlist_lookup_string.9f \ - nvlist_lookup_string_array.9f \ - nvlist_lookup_uint16.9f \ - nvlist_lookup_uint16_array.9f \ - nvlist_lookup_uint32.9f \ - nvlist_lookup_uint32_array.9f \ - nvlist_lookup_uint64.9f \ - nvlist_lookup_uint64_array.9f \ - nvlist_lookup_uint8.9f \ - nvlist_lookup_uint8_array.9f \ - nvlist_merge.9f \ - nvlist_pack.9f \ - nvlist_remove_all.9f \ - nvlist_size.9f \ - nvlist_t.9f \ - nvlist_unpack.9f \ - nvlist_xalloc.9f \ - nvlist_xdup.9f \ - nvlist_xpack.9f \ - nvlist_xunpack.9f \ - nvpair_name.9f \ - nvpair_type.9f \ - nvpair_value_boolean_array.9f \ - nvpair_value_byte_array.9f \ - nvpair_value_int16.9f \ - nvpair_value_int16_array.9f \ - nvpair_value_int32.9f \ - nvpair_value_int32_array.9f \ - nvpair_value_int64.9f \ - nvpair_value_int64_array.9f \ - nvpair_value_int8.9f \ - nvpair_value_int8_array.9f \ - nvpair_value_nvlist.9f \ - nvpair_value_nvlist_array.9f \ - nvpair_value_string.9f \ - nvpair_value_string_array.9f \ - nvpair_value_uint16.9f \ - nvpair_value_uint16_array.9f \ - nvpair_value_uint32.9f \ - nvpair_value_uint32_array.9f \ - nvpair_value_uint64.9f \ - nvpair_value_uint64_array.9f \ - nvpair_value_uint8.9f \ - nvpair_value_uint8_array.9f \ - otherq.9f \ - outl.9f \ - outw.9f \ - pci_config_get16.9f \ - pci_config_get32.9f \ - pci_config_get64.9f \ - pci_config_getb.9f \ - pci_config_getl.9f \ - pci_config_getll.9f \ - pci_config_getw.9f \ - pci_config_put16.9f \ - pci_config_put32.9f \ - pci_config_put64.9f \ - pci_config_put8.9f \ - pci_config_putb.9f \ - pci_config_putl.9f \ - pci_config_putll.9f \ - pci_config_putw.9f \ - pci_config_teardown.9f \ - pci_ereport_post.9f \ - pci_ereport_teardown.9f \ - pci_restore_config_regs.9f \ - pm_idle_component.9f \ - pm_lower_power.9f \ - priv_policy_choice.9f \ - priv_policy_only.9f \ - proc_ref.9f \ - proc_unref.9f \ - qprocsoff.9f \ - qwait_sig.9f \ - rd.9f \ - repinsb.9f \ - repinsd.9f \ - repinsw.9f \ - repoutsb.9f \ - repoutsd.9f \ - repoutsw.9f \ - rmallocmap_wait.9f \ - rmfreemap.9f \ - rw_destroy.9f \ - rw_downgrade.9f \ - rw_enter.9f \ - rw_exit.9f \ - rw_init.9f \ - rw_read_locked.9f \ - rw_tryenter.9f \ - rw_tryupgrade.9f \ - samestr.9f \ - scsi_dmafree.9f \ - scsi_dname.9f \ - scsi_hba_detach.9f \ - scsi_hba_fini.9f \ - scsi_hba_pkt_free.9f \ - scsi_hba_tran_free.9f \ - scsi_ifsetcap.9f \ - scsi_mname.9f \ - scsi_pktfree.9f \ - scsi_resalloc.9f \ - scsi_resfree.9f \ - scsi_rname.9f \ - scsi_sense_asc.9f \ - scsi_sense_ascq.9f \ - scsi_sense_cmdspecific_uint64.9f \ - scsi_sense_info_uint64.9f \ - scsi_sname.9f \ - scsi_unslave.9f \ - sema_destroy.9f \ - sema_init.9f \ - sema_p.9f \ - sema_p_sig.9f \ - sema_tryp.9f \ - sema_v.9f \ - strcasecmp.9f \ - strcat.9f \ - strchr.9f \ - strcmp.9f \ - strcpy.9f \ - strdup.9f \ - strfree.9f \ - strlcat.9f \ - strlcpy.9f \ - strlen.9f \ - strncasecmp.9f \ - strncat.9f \ - strncmp.9f \ - strncpy.9f \ - strnlen.9f \ - strrchr.9f \ - strspn.9f \ - taskq_suspended.9f \ - uconv_u16tou8.9f \ - uconv_u32tou16.9f \ - uconv_u32tou8.9f \ - uconv_u8tou16.9f \ - uconv_u8tou32.9f \ - unfreezestr.9f \ - usb_alloc_bulk_req.9f \ - usb_alloc_ctrl_req.9f \ - usb_alloc_intr_req.9f \ - usb_alloc_isoc_req.9f \ - usb_client_detach.9f \ - usb_free_bulk_req.9f \ - usb_free_ctrl_req.9f \ - usb_free_descr_tree.9f \ - usb_free_dev_data.9f \ - usb_free_intr_req.9f \ - usb_free_isoc_req.9f \ - usb_get_if_number.9f \ - usb_owns_device.9f \ - usb_pipe_ctrl_xfer_wait.9f \ - usb_pipe_get_private.9f \ + makecom_g0.9f \ + makecom_g0_s.9f \ + makecom_g1.9f \ + makecom_g5.9f \ + membar_consumer.9f \ + membar_enter.9f \ + membar_exit.9f \ + membar_producer.9f \ + memcmp.9f \ + memcpy.9f \ + memmove.9f \ + memset.9f \ + minphys.9f \ + mod_info.9f \ + mod_modname.9f \ + mod_remove.9f \ + mutex_destroy.9f \ + mutex_enter.9f \ + mutex_exit.9f \ + mutex_init.9f \ + mutex_owned.9f \ + mutex_tryenter.9f \ + net_event_notify_unregister.9f \ + net_instance_notify_unregister.9f \ + net_instance_protocol_unregister.9f \ + numtos.9f \ + nv_alloc_fini.9f \ + nv_alloc_init.9f \ + nvlist_add_boolean_array.9f \ + nvlist_add_boolean_value.9f \ + nvlist_add_byte.9f \ + nvlist_add_byte_array.9f \ + nvlist_add_int16.9f \ + nvlist_add_int16_array.9f \ + nvlist_add_int32.9f \ + nvlist_add_int32_array.9f \ + nvlist_add_int64.9f \ + nvlist_add_int64_array.9f \ + nvlist_add_int8.9f \ + nvlist_add_int8_array.9f \ + nvlist_add_nvlist.9f \ + nvlist_add_nvlist_array.9f \ + nvlist_add_nvpair.9f \ + nvlist_add_string.9f \ + nvlist_add_string_array.9f \ + nvlist_add_uint16.9f \ + nvlist_add_uint16_array.9f \ + nvlist_add_uint32.9f \ + nvlist_add_uint32_array.9f \ + nvlist_add_uint64.9f \ + nvlist_add_uint64_array.9f \ + nvlist_add_uint8.9f \ + nvlist_add_uint8_array.9f \ + nvlist_dup.9f \ + nvlist_exists.9f \ + nvlist_free.9f \ + nvlist_lookup_boolean_array.9f \ + nvlist_lookup_boolean_value.9f \ + nvlist_lookup_byte.9f \ + nvlist_lookup_byte_array.9f \ + nvlist_lookup_int16.9f \ + nvlist_lookup_int16_array.9f \ + nvlist_lookup_int32.9f \ + nvlist_lookup_int32_array.9f \ + nvlist_lookup_int64.9f \ + nvlist_lookup_int64_array.9f \ + nvlist_lookup_int8.9f \ + nvlist_lookup_int8_array.9f \ + nvlist_lookup_nvlist.9f \ + nvlist_lookup_nvlist_array.9f \ + nvlist_lookup_pairs.9f \ + nvlist_lookup_string.9f \ + nvlist_lookup_string_array.9f \ + nvlist_lookup_uint16.9f \ + nvlist_lookup_uint16_array.9f \ + nvlist_lookup_uint32.9f \ + nvlist_lookup_uint32_array.9f \ + nvlist_lookup_uint64.9f \ + nvlist_lookup_uint64_array.9f \ + nvlist_lookup_uint8.9f \ + nvlist_lookup_uint8_array.9f \ + nvlist_merge.9f \ + nvlist_pack.9f \ + nvlist_remove_all.9f \ + nvlist_size.9f \ + nvlist_t.9f \ + nvlist_unpack.9f \ + nvlist_xalloc.9f \ + nvlist_xdup.9f \ + nvlist_xpack.9f \ + nvlist_xunpack.9f \ + nvpair_name.9f \ + nvpair_type.9f \ + nvpair_value_boolean_array.9f \ + nvpair_value_byte_array.9f \ + nvpair_value_int16.9f \ + nvpair_value_int16_array.9f \ + nvpair_value_int32.9f \ + nvpair_value_int32_array.9f \ + nvpair_value_int64.9f \ + nvpair_value_int64_array.9f \ + nvpair_value_int8.9f \ + nvpair_value_int8_array.9f \ + nvpair_value_nvlist.9f \ + nvpair_value_nvlist_array.9f \ + nvpair_value_string.9f \ + nvpair_value_string_array.9f \ + nvpair_value_uint16.9f \ + nvpair_value_uint16_array.9f \ + nvpair_value_uint32.9f \ + nvpair_value_uint32_array.9f \ + nvpair_value_uint64.9f \ + nvpair_value_uint64_array.9f \ + nvpair_value_uint8.9f \ + nvpair_value_uint8_array.9f \ + otherq.9f \ + outl.9f \ + outw.9f \ + pci_config_get16.9f \ + pci_config_get32.9f \ + pci_config_get64.9f \ + pci_config_getb.9f \ + pci_config_getl.9f \ + pci_config_getll.9f \ + pci_config_getw.9f \ + pci_config_put16.9f \ + pci_config_put32.9f \ + pci_config_put64.9f \ + pci_config_put8.9f \ + pci_config_putb.9f \ + pci_config_putl.9f \ + pci_config_putll.9f \ + pci_config_putw.9f \ + pci_config_teardown.9f \ + pci_ereport_post.9f \ + pci_ereport_teardown.9f \ + pci_restore_config_regs.9f \ + pm_idle_component.9f \ + pm_lower_power.9f \ + priv_policy_choice.9f \ + priv_policy_only.9f \ + proc_ref.9f \ + proc_unref.9f \ + qprocsoff.9f \ + qwait_sig.9f \ + rd.9f \ + repinsb.9f \ + repinsd.9f \ + repinsw.9f \ + repoutsb.9f \ + repoutsd.9f \ + repoutsw.9f \ + rmallocmap_wait.9f \ + rmfreemap.9f \ + rw_destroy.9f \ + rw_downgrade.9f \ + rw_enter.9f \ + rw_exit.9f \ + rw_init.9f \ + rw_read_locked.9f \ + rw_tryenter.9f \ + rw_tryupgrade.9f \ + samestr.9f \ + scsi_dmafree.9f \ + scsi_dname.9f \ + scsi_hba_detach.9f \ + scsi_hba_fini.9f \ + scsi_hba_pkt_free.9f \ + scsi_hba_tran_free.9f \ + scsi_ifsetcap.9f \ + scsi_mname.9f \ + scsi_pktfree.9f \ + scsi_resalloc.9f \ + scsi_resfree.9f \ + scsi_rname.9f \ + scsi_sense_asc.9f \ + scsi_sense_ascq.9f \ + scsi_sense_cmdspecific_uint64.9f \ + scsi_sense_info_uint64.9f \ + scsi_sname.9f \ + scsi_unslave.9f \ + sema_destroy.9f \ + sema_init.9f \ + sema_p.9f \ + sema_p_sig.9f \ + sema_tryp.9f \ + sema_v.9f \ + snprintf.9f \ + strcasecmp.9f \ + strcat.9f \ + strchr.9f \ + strcmp.9f \ + strcpy.9f \ + strdup.9f \ + strfree.9f \ + strlcat.9f \ + strlcpy.9f \ + strlen.9f \ + strncasecmp.9f \ + strncat.9f \ + strncmp.9f \ + strncpy.9f \ + strnlen.9f \ + strrchr.9f \ + strspn.9f \ + taskq_suspended.9f \ + uconv_u16tou8.9f \ + uconv_u32tou16.9f \ + uconv_u32tou8.9f \ + uconv_u8tou16.9f \ + uconv_u8tou32.9f \ + unfreezestr.9f \ + usb_alloc_bulk_req.9f \ + usb_alloc_ctrl_req.9f \ + usb_alloc_intr_req.9f \ + usb_alloc_isoc_req.9f \ + usb_client_detach.9f \ + usb_free_bulk_req.9f \ + usb_free_ctrl_req.9f \ + usb_free_descr_tree.9f \ + usb_free_dev_data.9f \ + usb_free_intr_req.9f \ + usb_free_isoc_req.9f \ + usb_get_if_number.9f \ + usb_owns_device.9f \ + usb_pipe_ctrl_xfer_wait.9f \ + usb_pipe_get_private.9f \ usb_pipe_open.9f \ - usb_pipe_stop_intr_polling.9f \ - usb_pipe_stop_isoc_polling.9f \ - usb_print_descr_tree.9f \ - usb_set_alt_if.9f \ - usb_set_cfg.9f \ - usb_unregister_hotplug_cbs.9f \ - va_copy.9f \ - va_end.9f \ - va_start.9f \ - vcmn_err.9f \ - vzcmn_err.9f \ - wr.9f \ - zcmn_err.9f + usb_pipe_stop_intr_polling.9f \ + usb_pipe_stop_isoc_polling.9f \ + usb_print_descr_tree.9f \ + usb_set_alt_if.9f \ + usb_set_cfg.9f \ + usb_unregister_hotplug_cbs.9f \ + va_copy.9f \ + va_end.9f \ + va_start.9f \ + vcmn_err.9f \ + vsnprintf.9f \ + vsprintf.9f \ + vzcmn_err.9f \ + wr.9f \ + zcmn_err.9f assert.9f := LINKSRC = ASSERT.9f @@ -2021,6 +2024,10 @@ sema_p_sig.9f := LINKSRC = semaphore.9f sema_tryp.9f := LINKSRC = semaphore.9f sema_v.9f := LINKSRC = semaphore.9f +snprintf.9f := LINKSRC = sprintf.9f +vsprintf.9f := LINKSRC = sprintf.9f +vsnprintf.9f := LINKSRC = sprintf.9f + numtos.9f := LINKSRC = stoi.9f ddi_strdup.9f := LINKSRC = string.9f diff --git a/usr/src/man/man9f/cmn_err.9f b/usr/src/man/man9f/cmn_err.9f index f328df6341..e7fe3b544c 100644 --- a/usr/src/man/man9f/cmn_err.9f +++ b/usr/src/man/man9f/cmn_err.9f @@ -1,470 +1,388 @@ -'\" te -.\" Copyright (c) 2014, Nexenta Systems, Inc. All Rights Reserved. -.\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved. +.\" +.\" 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] +.\" +.\" .\" Copyright 1989 AT&T -.\" 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] -.TH CMN_ERR 9F "Oct 28, 2014" -.SH NAME -cmn_err, dev_err, vcmn_err, zcmn_err, vzcmn_err \- -display an error message or panic the system -.SH SYNOPSIS -.LP -.nf -#include <sys/cmn_err.h> -#include <sys/ddi.h> -#include <sys/sunddi.h> - - - -\fBvoid\fR \fBcmn_err\fR(\fBint\fR \fIlevel\fR, \fBchar *\fR\fIformat\fR, ...); -.fi - -.LP -.nf -\fBvoid\fR \fBdev_err\fR(\fBdev_info_t\fR \fI*dip\fR, \fBint\fR \fIlevel\fR, \fBchar *\fR\fIformat\fR, ...); -.fi - -.LP -.nf -#include <sys/varargs.h> - - - -\fBvoid\fR \fBvcmn_err\fR(\fBint\fR \fIlevel\fR, \fBchar *\fR\fIformat\fR, \fBva_list\fR \fIap\fR); -.fi - -.LP -.nf -#include <sys/types.h> - - - -\fBvoid\fR \fBzcmn_err\fR(\fBzoneid_t\fR \fIzoneid\fR, \fBint\fR \fIlevel\fR, \fBchar *\fR\fIformat\fR, ...); -.fi - -.LP -.nf -\fBvoid\fR \fBvzcmn_err\fR(\fBzoneid_t\fR \fIzoneid\fR, \fBint\fR \fIlevel\fR, \fBchar *\fR\fIformat\fR, \fBva_list\fR \fIap\fR); -.fi - -.SH INTERFACE LEVEL -.LP +.\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved. +.\" Copyright 2016 Nexenta Systems, Inc. +.\" +.Dd Dec 1, 2016 +.Dt CMN_ERR 9F +.Os +.Sh NAME +.Nm cmn_err, dev_err, vcmn_err, zcmn_err, vzcmn_err +.Nd display an error message or panic the system +.Sh SYNOPSIS +.In sys/cmn_err.h +.In sys/ddi.h +.In sys/sunddi.h +.Ft void +.Fo cmn_err +.Fa "int level" +.Fa "char *format" +.Fa ... +.Fc +.Ft void +.Fo dev_err +.Fa "dev_info_t *dip" +.Fa "int level" +.Fa "char *format" +.Fa ... +.Fc +.In sys/varargs.h +.Ft void +.Fo vcmn_err +.Fa "int level" +.Fa "char *format" +.Fa "va_list ap" +.Fc +.In sys/types.h +.Ft void +.Fo zcmn_err +.Fa "zoneid_t zoneid" +.Fa "int level" +.Fa "char *format" +.Fa ... +.Fc +.Ft void +.Fo vzcmn_err +.Fa "zoneid_t zoneid" +.Fa "int level" +.Fa "char *format" +.Fa "va_list ap" +.Fc +.Sh INTERFACE LEVEL Architecture independent level 1 (DDI/DKI). -.SH PARAMETERS -.SS "cmn_err(\|)" -.ne 2 -.na -\fB\fIlevel\fR\fR -.ad -.RS 10n +.Sh PARAMETERS +.Ss Fn cmn_err +.Bl -tag -width Ds +.It Fa level A constant indicating the severity of the error condition. -.RE - -.sp -.ne 2 -.na -\fB\fIformat\fR\fR -.ad -.RS 10n +.It Fa format Message to be displayed. -.RE - -.SS "dev_err(\|)" -.LP -The \fBdev_err()\fR function works exactly like \fBcmn_err()\fR, but includes -an additional argument: -.sp -.ne 2 -.na -\fB\fIdip\fR\fR -.ad -.RS 10n -A pointer to the device's \fBdev_info\fR structure. -.RE - -.SS "vcmn_err(\|)" -.LP -The \fBvcmn_err()\fR function takes \fIlevel\fR and \fIformat\fR as described -for \fBcmn_err()\fR, but its third argument is different: -.sp -.ne 2 -.na -\fB\fIap\fR\fR -.ad -.RS 6n +.El +.Ss Fn dev_err +The +.Fn dev_err +function works exactly like +.Fn cmn_err , +but includes an additional argument: +.Bl -tag -width Ds +.It Fa dip +A pointer to the device's +.Ft dev_info +structure. +.El +.Ss Fn vcmn_err +The +.Fn vcmn_err +function takes +.Fa level +and +.Fa format +as described for +.Fn cmn_err , +but its third argument is different: +.Bl -tag -width Ds +.It Fa ap Variable argument list passed to the function. -.RE - -.SS "zcmn_err(\|)" -.LP -The \fBzcmn_err()\fR function works exactly like \fBcmn_err()\fR, but includes -an additional argument: -.sp -.ne 2 -.na -\fB\fIzoneid\fR\fR -.ad -.RS 10n -Zone to which log messages should be directed. See \fBzones\fR(5). -.RE - -.SS "vzcmn_err(\|)" -.LP -The \fBvzcmn_err()\fR function works exactly like \fBvcmn_err()\fR, but includes -an additional argument: -.sp -.ne 2 -.na -\fB\fIzoneid\fR\fR -.ad -.RS 10n -Zone to which log messages should be directed. See \fBzones\fR(5). -.RE - -.SH DESCRIPTION -.SS "cmn_err(\|)" -.LP -The \fBcmn_err()\fR function displays a specified message on the console. -\fBcmn_err()\fR can also panic the system. When the system panics, it attempts -to save recent changes to data, display a "panic message" on the console, -attempt to write a core file, and halt system processing. See the -\fBCE_PANIC\fR \fIlevel\fR below. -.sp -.LP -\fIlevel\fR is a constant indicating the severity of the error condition. The -four severity levels are: -.sp -.ne 2 -.na -\fB\fBCE_CONT\fR\fR -.ad -.RS 12n +.El +.Ss Fn zcmn_err +The +.Fn zcmn_err +function works exactly like +.Fn cmn_err , +but includes an additional argument: +.Bl -tag -width Ds +.It Fa zoneid +Zone to which log messages should be directed. +See +.Xr zones 5 . +.El +.Ss Fn vzcmn_err +The +.Fn vzcmn_err +function works exactly like +.Fn vcmn_err , +but includes an additional argument: +.Bl -tag -width Ds +.It Fa zoneid +Zone to which log messages should be directed. +See +.Xr zones 5 . +.El +.Sh DESCRIPTION +.Ss Fn cmn_err +The +.Fn cmn_err +function displays a specified message on the console. +.Fn cmn_err +can also panic the system. +When the system panics, it attempts to save recent changes to data, display a +.Qq panic message +on the console, attempt to write a core file, and halt system processing. +See the +.Sy CE_PANIC +.Fa level +below. +.Pp +.Fa level +is a constant indicating the severity of the error condition. +The four severity levels are: +.Bl -tag -width "CE_PANIC" +.It Sy CE_CONT Used to continue another message or to display an informative message not -associated with an error. Note that multiple \fBCE_CONT\fR messages without a -newline may or may not appear on the system console or in the system log as a -single line message. A single line message may be produced by constructing the -message with \fBsprintf\fR(9F) or \fBvsprintf\fR(9F) before calling -\fBcmn_err()\fR. -.RE - -.sp -.ne 2 -.na -\fB\fBCE_NOTE\fR\fR -.ad -.RS 12n -Used to display a message preceded with \fBNOTICE\fR. This message is used to -report system events that do not necessarily require user action, but may -interest the system administrator. For example, a message saying that a sector -on a disk needs to be accessed repeatedly before it can be accessed correctly -might be noteworthy. -.RE - -.sp -.ne 2 -.na -\fB\fBCE_WARN\fR\fR -.ad -.RS 12n -Used to display a message preceded with \fBWARNING\fR. This message is used to -report system events that require immediate attention, such as those where if -an action is not taken, the system may panic. For example, when a peripheral -device does not initialize correctly, this level should be used. -.RE - -.sp -.ne 2 -.na -\fB\fBCE_PANIC\fR\fR -.ad -.RS 12n -Used to display a message preceded with \fB"panic"\fR, and to panic the system. +associated with an error. +Note that multiple +.Sy CE_CONT +messages without a newline may or may not appear on the system console or in the +system log as a single line message. +A single line message may be produced by constructing the message with +.Xr sprintf 9F +or +.Xr vsprintf 9F +before calling +.Fn cmn_err . +.It Sy CE_NOTE +Used to display a message preceded with +.Sy NOTICE . +This message is used to report system events that do not necessarily require +user action, but may interest the system administrator. +For example, a message saying that a sector on a disk needs to be accessed +repeatedly before it can be accessed correctly might be noteworthy. +.It Sy CE_WARN +Used to display a message preceded with +.Sy WARNING . +This message is used to report system events that require immediate attention, +such as those where if an action is not taken, the system may panic. +For example, when a peripheral device does not initialize correctly, this level +should be used. +.It Sy CE_PANIC +Used to display a message preceded with +.Qq Sy panic , +and to panic the system. Drivers should specify this level only under the most severe conditions or when -debugging a driver. A valid use of this level is when the system cannot -continue to function. If the error is recoverable, or not essential to -continued system operation, do not panic the system. -.RE - -.sp -.LP -\fIformat\fR is the message to be displayed. It is a character string which may -contain plain characters and conversion specifications. By default, the message -is sent both to the system console and to the system log. -.sp -.LP -Each conversion specification in \fIformat\fR is introduced by the \fB%\fR -character, after which the following appear in sequence: -.sp -.LP -An optional decimal digit specifying a minimum field width for numeric -conversion. The converted value will be right-justified and padded with leading -zeroes if it has fewer characters than the minimum. -.sp -.LP -An optional \fBl\fR (\fBll\fR) specifying that a following \fBd\fR, \fBD\fR, -\fBo\fR, \fBO\fR, \fBx\fR, \fBX\fR, or \fBu\fR conversion character applies to -a \fBlong\fR (\fBlong long\fR) integer argument. An \fBl\fR (\fBll\fR) before -any other conversion character is ignored. -.sp -.LP -A character indicating the type of conversion to be applied: -.sp -.ne 2 -.na -\fB\fBd\fR,\fBD\fR,\fBo\fR,\fBO\fR,\fBx\fR,\fBX\fR,\fBu\fR\fR -.ad -.RS 17n -The integer argument is converted to signed decimal (\fBd\fR, \fBD\fR), -unsigned octal (\fBo\fR, \fBO\fR), unsigned hexadecimal (\fBx\fR, \fBX\fR), or -unsigned decimal (\fBu\fR), respectively, and displayed. The letters -\fBabcdef\fR are used for \fBx\fR and \fBX\fR conversion. -.RE - -.sp -.ne 2 -.na -\fB\fBc\fR\fR -.ad -.RS 17n -The character value of the argument is displayed. -.RE - -.sp -.ne 2 -.na -\fB\fBb\fR\fR -.ad -.RS 17n -The \fB%b\fR conversion specification allows bit values to be displayed -meaningfully. Each \fB%b\fR takes an integer value and a format string from the -argument list. The first character of the format string should be the output -base encoded as a control character. This base is used to display the integer -argument. The remaining groups of characters in the format string consist of a -bit number (between 1 and 32, also encoded as a control character) and the next -characters (up to the next control character or '\e0') give the name of the bit -field. The string corresponding to the bit fields set in the integer argument -is displayed after the numerical value. See EXAMPLE section. -.RE - -.sp -.ne 2 -.na -\fBp\fR -.ad -.RS 17n -The argument is taken to be a pointer; the value of the pointer is displayed in -unsigned hexadecimal. The display format is equivalent to \fB%lx\fR. To avoid -lint warnings, cast pointers to type \fBvoid *\fR when using the \fB%p\fR -format specifier. -.RE - -.sp -.ne 2 -.na -\fB\fBs\fR\fR -.ad -.RS 17n -The argument is taken to be a string (character pointer), and characters from -the string are displayed until a null character is encountered. If the -character pointer is \fINULL\fR, the string \fB<null string>\fR is used in its -place. -.RE - -.sp -.ne 2 -.na -\fB\fB%\fR\fR -.ad -.RS 17n -Copy a \fB%\fR; no argument is converted. -.RE - -.sp -.LP -The first character in \fIformat\fR affects where the message will be written: -.sp -.ne 2 -.na -\fB\fB!\fR\fR -.ad -.RS 5n +debugging a driver. +A valid use of this level is when the system cannot continue to function. +If the error is recoverable, or not essential to continued system operation, do +not panic the system. +.El +.Pp +The +.Fa format +is identical to the one described in +.Xr sprintf 9F +with additional meaning of the first character affecting where the message will +be written: +.Bl -tag -width Ds +.It Sy \! The message goes only to the system log. -.RE - -.sp -.ne 2 -.na -\fB\fB^\fR\fR -.ad -.RS 5n +.It Sy ^ The message goes only to the console. -.RE - -.sp -.ne 2 -.na -\fB\fB?\fR\fR -.ad -.RS 5n -If \fIlevel\fR is also \fBCE_CONT,\fR the message is always sent to the system -log, but is only written to the console when the system has been booted in -verbose mode. See \fBkernel\fR(1M). If neither condition is met, the '?\|' +.It Sy \? +If +.Fa level +is also +.Sy CE_CONT , +the message is always sent to the system log, but is only written to the console +when the system has been booted in verbose mode. +See +.Xr kernel 1M . +If neither condition is met, the +.Qq Sy \? character has no effect and is simply ignored. -.RE -.sp -.LP -Refer to \fBsyslogd\fR(1M) to determine where the system log is written. -.sp -.LP -The \fBcmn_err()\fR function sends log messages to the log of the global zone. -\fBcmn_err()\fR appends a \fB\en\fR to each \fIformat\fR, except when -\fIlevel\fR is \fBCE_CONT\fR. -.SS "dev_err(\|)" -.LP -With the exception of its first argument (\fBdip\fR), \fBdev_err()\fR is -identical to \fBcmn_err()\fR. \fBdip\fR is a pointer to a device's -\fBdev_info\fR structure, which is used to prepend the driver name and -instance number to the message. The driver name and instance number are -retrieved using \fBddi_driver_name\fR(9F) and \fBddi_get_instance\fR(9F). -.SS "vcmn_err(\|)" -.LP -The \fBvcmn_err()\fR function is identical to \fBcmn_err()\fR except that its -last argument, \fIap\fR, is a pointer to a variable list of arguments. \fIap\fR +.El +.Pp +Refer to +.Xr syslogd 1M +to determine where the system log is written. +.Pp +The +.Fn cmn_err +function sends log messages to the log of the global zone. +.Fn cmn_err +appends a +.Sy \en +to each +.Fa format , +except when +.Fa level +is +.Sy CE_CONT . +.Ss Fn dev_err +With the exception of its first argument +.Pq Fa dip , +.Fn dev_err +is identical to +.Fn cmn_err . +.Fa dip +is a pointer to a device's +.Ft dev_info +structure, which is used to prepend the driver name and instance number to the +message. +The driver name and instance number are retrieved using +.Xr ddi_driver_name 9F +and +.Xr ddi_get_instance 9F . +.Ss Fn vcmn_err +The +.Fn vcmn_err +function is identical to +.Fn cmn_err +except that its last argument, +.Fa ap , +is a pointer to a variable list of arguments. +.Fa ap contains the list of arguments used by the conversion specifications in -\fIformat\fR. \fIap\fR must be initialized by calling \fBva_start\fR(9F). -\fBva_end\fR(9F) is used to clean up and must be called after each traversal of -the list. Multiple traversals of the argument list, each bracketed by -\fBva_start\fR(9F) and \fBva_end\fR(9F), are possible. -.SS "zcmn_err(\|)" -.LP -With the exception of its first argument (\fBzoneid\fR), \fBzcmn_err()\fR is -identical to \fBcmn_err()\fR. \fBzoneid\fR is the numeric ID of the zone to -which the message should be directed. Note that \fBzoneid\fR only has an effect -if the message is sent to the system log. Using \fBzoneid\fR will cause -messages to be sent to the log associated with the specified local zone rather -than the log in the global zone. This is accomplished by the message being -received and processed by the \fBsyslogd\fR(1M) process running in the -specified zone instead of the one running in the global zone. You can retrieve -a process zone ID from its credential structure using \fBcrgetzoneid\fR(9F). -.SS "vzcmn_err(\|)" -.LP -With the exception of its first argument (\fBzoneid\fR), \fBvzcmn_err()\fR is -identical to \fBvcmn_err()\fR. See the description of \fBzcmn_err()\fR -above for an explanation on how the \fBzoneid\fR argument is handled. -.SH RETURN VALUES -.LP -None. However, if an unknown \fIlevel\fR is passed to \fBcmn_err()\fR, the -following panic error message is displayed: -.sp -.in +2 -.nf -panic: unknown level in cmn_err (level=\fIlevel\fR, msg=format) -.fi -.in -2 -.sp - -.SH CONTEXT -.LP -The \fBcmn_err()\fR function can be called from user, kernel, interrupt, or -high-level interrupt context. -.SH EXAMPLES -.LP -\fBExample 1 \fRUsing \fBcmn_err()\fR -.sp -.LP -This first example shows how \fBcmn_err()\fR can record tracing and debugging -information only in the system log (lines 17); display problems with a device -only on the system console (line 23); or display problems with the device on -both the system console and in the system log (line 28). - -.sp -.in +2 -.nf +.Fa format . +.Fa ap +must be initialized by calling +.Xr va_start 9F . +.Xr va_end 9F +is used to clean up and must be called after each traversal of the list. +Multiple traversals of the argument list, each bracketed by +.Xr va_start 9F +and +.Xr va_end 9F , +are possible. +.Ss Fn zcmn_err +With the exception of its first argument +.Pq Fa zoneid , +.Fn zcmn_err +is identical to +.Fn cmn_err . +.Fa zoneid +is the numeric ID of the zone to which the message should be directed. +Note that +.Fa zoneid +only has an effect if the message is sent to the system log. +Using +.Fa zoneid +will cause messages to be sent to the log associated with the specified local +zone rather than the log in the global zone. +This is accomplished by the message being received and processed by the +.Xr syslogd 1M +process running in the specified zone instead of the one running in the global +zone. +You can retrieve a process zone ID from its credential structure using +.Xr crgetzoneid 9F . +.Ss Fn vzcmn_err +With the exception of its first argument +.Pq Fa zoneid , +.Fn vzcmn_err +is identical to +.Fn vcmn_err . +See the description of +.Fn zcmn_err +above for an explanation on how the +.Fa zoneid +argument is handled. +.Sh CONTEXT +The +.Fn cmn_err +function can be called from user, kernel, interrupt, or high-level interrupt +context. +.Sh RETURN VALUES +None. However, if an unknown +.Fa level +is passed to +.Fn cmn_err , +the following panic error message is displayed: +.Bd -literal +panic: unknown level in cmn_err (level=level, msg=format) +.Ed +.Sh EXAMPLES +.Bl -tag -width Ds +.It Sy Example 1 No Using Fn cmn_err +This first example shows how +.Fn cmn_err +can record tracing and debugging information only in the system log +.Pq lines 17 ; +display problems with a device only on the system console +.Pq line 23 ; +or display problems with the device on both the system console and in the system +log +.Pq line 28 . +.Bd -literal 1 struct reg { 2 uchar_t data; 3 uchar_t csr; 4 }; 5 6 struct xxstate { -7 .\|.\|. +7 ... 8 dev_info_t *dip; 9 struct reg *regp; -10 .\|.\|. +10 ... 11 }; 12 13 dev_t dev; 14 struct xxstate *xsp; -15 .\|.\|. +15 ... 16 #ifdef DEBUG /* in debugging mode, log function call */ 17 cmn_err(CE_CONT, "!%s%d: xxopen function called.", 18 ddi_binding_name(xsp->dip), getminor(dev)); 19 #endif /* end DEBUG */ -20 .\|.\|. +20 ... 21 /* display device power failure on system console */ 22 if ((xsp->regp->csr & POWER) == OFF) 23 cmn_err(CE_NOTE, "^OFF.", 24 ddi_binding_name(xsp->dip), getminor(dev)); -25 .\|.\|. +25 ... 26 /* display warning if device has bad VTOC */ 27 if (xsp->regp->csr & BADVTOC) 28 cmn_err(CE_WARN, "%s%d: xxopen: Bad VTOC.", 29 ddi_binding_name(xsp->dip), getminor(dev)); -.fi -.in -2 - -.LP -\fBExample 2 \fRUsing the %b conversion specification -.sp -.LP -This example shows how to use the \fB%b\fR conversion specification. Because of -the leading '?\|' character in the format string, this message will always be -logged, but it will only be displayed when the kernel is booted in verbose -mode. - -.sp -.in +2 -.nf +.Ed +.It Sy Example 2 No Using the %b conversion specification +This example shows how to use the +.Sy %b +conversion specification. +Because of the leading +.Qq Sy \? +character in the format string, this message will always be logged, but it will +only be displayed when the kernel is booted in verbose mode. +.Bd -literal cmn_err(CE_CONT, "?reg=0x%b\en", regval, "\e020\e3Intr\e2Err\e1Enable"); -.fi -.in -2 -.sp - -.LP -\fBExample 3 \fRUsing \fIregval\fR -.sp -.LP -When \fIregval\fR is set to (decimal) \fB13\fR, the following message would be -displayed: - -.sp -.in +2 -.nf +.Ed +.It Sy Example 3 No Using Fa regval +When +.Fa regval +is set to +.Pq decimal +13, the following message would be displayed: +.Bd -literal reg=0xd<Intr,,Enable> -.fi -.in -2 -.sp - -.LP -\fBExample 4 \fRError Routine -.sp -.LP +.Ed +.It Sy Example 4 No Error Routine This example shows an error reporting routine which accepts a variable number of arguments and displays a single line error message both in the system log -and on the system console. Note the use of \fBvsprintf()\fR to construct the -error message before calling \fBcmn_err()\fR. - -.sp -.in +2 -.nf +and on the system console. +Note the use of +.Fn vsprintf +to construct the error message before calling +.Fn cmn_err . +.Bd -literal #include <sys/varargs.h> #include <sys/ddi.h> #include <sys/sunddi.h> #define MAX_MSG 256; void -xxerror(dev_info_t *dip, int level, const char *fmt, .\|.\|.\|) +xxerror(dev_info_t *dip, int level, const char *fmt, ...) { va_list ap; int instance; @@ -484,44 +402,52 @@ va_end(ap); cmn_err(level, "%s%d: %s", name, instance, buf); } -.fi -.in -2 - -.LP -\fBExample 5 \fRLog to Current Zone -.sp -.LP +.Ed +.It Sy Example 5 No Log to Current Zone This example shows how messages can be sent to the log of the zone in which a -thread is currently running, when applicable. Note that most hardware-related -messages should instead be sent to the global zone using \fBcmn_err()\fR. - -.sp -.in +2 -.nf +thread is currently running, when applicable. +Note that most hardware-related messages should instead be sent to the global +zone using +.Fn cmn_err . +.Bd -literal zcmn_err(crgetzoneid(ddi_get_cred()), CE_NOTE, "out of processes"); -.fi -.in -2 - -.SH SEE ALSO -.LP -\fBdmesg\fR(1M), \fBkernel\fR(1M), \fBprintf\fR(3C), \fBzones\fR(5), -\fBddi_binding_name\fR(9F), \fBddi_cred\fR(9F), \fBddi_driver_name\fR(9F), -\fBddi_get_instance\fR(9F), \fBsprintf\fR(9F), \fBva_arg\fR(9F), -\fBva_end\fR(9F), \fBva_start\fR(9F), \fBvsprintf\fR(9F) -.sp -.LP -\fIWriting Device Drivers\fR -.SH WARNINGS -.LP -The \fBcmn_err()\fR function with the \fBCE_CONT\fR argument can be used by -driver developers as a driver code debugging tool. However, using -\fBcmn_err()\fR in this capacity can change system timing characteristics. -.SH NOTES -.LP -Messages of arbitrary length can be generated using \fBcmn_err()\fR, but if the -call to \fBcmn_err()\fR is made from high-level interrupt context and -insufficient memory is available to create a buffer of the specified size, the -message will be truncated to \fBLOG_MSGSIZE\fR bytes (see <\fBsys/log.h\fR>). -For this reason, callers of \fBcmn_err()\fR that require complete and accurate -message generation should post down from high-level interrupt context before -calling \fBcmn_err()\fR. +.Ed +.El +.Sh SEE ALSO +.Xr dmesg 1M , +.Xr kernel 1M , +.Xr zones 5 , +.Xr ddi_binding_name 9F , +.Xr ddi_cred 9F , +.Xr ddi_driver_name 9F , +.Xr ddi_get_instance 9F , +.Xr sprintf 9F , +.Xr va_arg 9F , +.Xr va_end 9F , +.Xr va_start 9F +.Pp +Writing Device Drivers +.Sh WARNINGS +The +.Fn cmn_err +function with the +.Sy CE_CONT +argument can be used by driver developers as a driver code debugging tool. +However, using +.Fn cmn_err +in this capacity can change system timing characteristics. +.Sh NOTES +Messages of arbitrary length can be generated using +.Fn cmn_err , +but if the call to +.Fn cmn_err +is made from high-level interrupt context and insufficient memory is available +to create a buffer of the specified size, the message will be truncated to +LOG_MSGSIZE +bytes +.Pq see Pa sys/log.h . +For this reason, callers of +.Fn cmn_err +that require complete and accurate message generation should post down from +high-level interrupt context before calling +.Fn cmn_err . diff --git a/usr/src/man/man9f/sprintf.9f b/usr/src/man/man9f/sprintf.9f new file mode 100644 index 0000000000..fafde05032 --- /dev/null +++ b/usr/src/man/man9f/sprintf.9f @@ -0,0 +1,344 @@ +.\" +.\" 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] +.\" +.\" +.\" Copyright 1989 AT&T +.\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved. +.\" Copyright 2016 Nexenta Systems, Inc. +.\" +.Dd Dec 1, 2016 +.Dt SPRINTF 9F +.Os +.Sh NAME +.Nm sprintf, snprintf, vsprintf, vsnprintf +.Nd format characters in memory +.Sh SYNOPSIS +.In sys/cmn_err.h +.In sys/ddi.h +.In sys/sunddi.h +.Ft "char *" +.Fo sprintf +.Fa "char *s" +.Fa "const char *format" +.Fa ... +.Fc +.Ft size_t +.Fo snprintf +.Fa "char *s" +.Fa "size_t n" +.Fa "const char *format" +.Fa ... +.Fc +.In sys/varargs.h +.Ft "char *" +.Fo vsprintf +.Fa "char *s" +.Fa "const char *format" +.Fa "va_list ap" +.Fc +.Ft size_t +.Fo vsnprintf +.Fa "char *s" +.Fa "size_t n" +.Fa "const char *format" +.Fa "va_list ap" +.Fc +.Sh INTERFACE LEVEL +illumos DDI specific +.Sh PARAMETERS +.Bl -tag -width Ds +.It Fa s +Pointer to a character string. +.It Fa n +Size of the buffer pointed to by +.Fa s . +.It Fa format +Pointer to a character string. +.It Fa ap +Pointer to a variable argument list. +.El +.Sh DESCRIPTION +The +.Fn sprintf +function places output, followed by the null byte +.Pq \e0 , +in consecutive bytes starting at +.Fa s ; +it is the user's responsibility to ensure that enough storage is available. +.Pp +The +.Fn snprintf +function is identical to +.Fn sprintf +with the addition of the argument +.Fa n , +which specifies the size of the buffer referred to by +.Fa s . +If +.Fa n +is 0, nothing is written and +.Fa s +can be a null pointer. +Otherwise, output bytes beyond the +.Fa n Ns \-1st +are discarded instead of being written to the array and a null byte is written +at the end of the bytes actually written into the array. +.Pp +The +.Fn vsprintf +and +.Fn vsnprintf +functions are the same as +.Fn sprintf +and +.Fn snprintf , +respectively, except that instead of being called with a variable number of +arguments, they are called with an argument list, +.Fa ap , +used by the conversion specifications in +.Fa format . +.Fa ap +is a variable argument list and must be initialized by calling +.Xr va_start 9F . +.Xr va_end 9F +is used to clean up and must be called after each traversal of the list. +Multiple traversals of the argument list, each bracketed by +.Xr va_start 9F +and +.Xr va_end 9F , +are possible. +.Pp +Each of these functions converts, formats, and prints its arguments under +control of the +.Fa format . +The +.Fa format +is composed of zero or more directives: ordinary characters, which are simply +copied to the output stream and conversion specifications, each of which results +in the fetching of zero or more arguments. +The results are undefined if there are insufficient arguments for the +.Fa format . +If the +.Fa format +is exhausted while arguments remain, the excess arguments are evaluated but are +otherwise ignored. +.Ss Conversion Specifications +Each conversion specification is introduced by the +.Qq Sy % +character after which the following appear in sequence: +.Bl -bullet +.It +Zero or more flags +.Pq in any order , +which modify the meaning of the conversion specification. +.It +An optional minimum field width. +If the converted value has fewer bytes than the field width, it will be padded +with spaces by default on the left; it will be padded on the right, if the +left-adjustment flag +.Pq Qq Sy ‐ , +described below, is given to the field width. +The field width takes the form of an asterisk +.Pq Qq Sy * , +described below, or a decimal integer. +.It +An optional precision that gives the minimum number of digits to appear for the +.Sy d , D , o , O , x , X , +or +.Sy u +conversions +.Pq the field is padded with leading zeros ; +or the maximum number of bytes to be printed from a string in s conversion. +The precision takes the form of a period +.Pq Qq Sy \&. +followed either by an asterisk +.Pq Qq Sy * , +described below, or an optional decimal digit string, where a null digit string +is treated as 0. +If a precision appears with any other conversion specifier, the behavior is +undefined. +.It +An optional length modifier that specified the size of the argument. +.It +A conversion specifier that indicates the type of conversion to be applied. +.El +.Pp +A field width, or precision, or both can be indicated by an asterisk +.Pq Qq Sy * . +In this case, an argument of type int supplies the field width or precision. +Arguments specifying field width, or precision, or both must appear in that +order before the argument, if any, to be converted. +A negative field width is taken as a +.Qq Sy \- +flag followed by a positive field width. +A negative precision is taken as if the precision were omitted. +.Ss Flag Characters +The flag characters and their meanings are: +.Bl -tag -width Ds +.It Sy \- +The result of the conversion will be left-justified within the field. +The conversion will be right-justified if this flag is not specified. +.It Sy 0 +For +.Sy d , D , o , O , x , X , +or +.Sy u +conversions, leading zeros +.Pq following any indication of sign or base +are used to pad to the field width; no space padding is performed. +If the +.Sy 0 +and +.Sy \- +flags both appear, the +.Sy 0 +flag will be ignored. +If a precision is specified, the +.Sy 0 +flag will be ignored. +For other conversions, the behavior is undefined. +.El +.Ss Length Modifiers +The length modifiers and their meanings are: +.Bl -tag -width Ds +.It Sy h +Specifies that a following +.Sy d , D , o , O , x , X , +or +.Sy u +conversion specifier applies to a short or unsigned +short argument +.Po the argument will have been promoted according to the integer promotions, +but its value will be converted to short or unsigned short before printing +.Pc . +.It Sy hh +Specifies that a following +.Sy d , D , o , O , x , X , +or +.Sy u +conversion specifier applies to a signed char or unsigned char argument +.Po the argument will have been promoted according to the integer promotions, +but its value will be converted to signed char or unsigned char before printing +.Pc . +.It Sy l +Specifies that a following +.Sy d , D , o , O , x , X , +or +.Sy u +conversion specifier applies to a long or unsigned long argument. +.It Sy ll +Specifies that a following +.Sy d , D , o , O , x , X , +or +.Sy u +conversion specifier applies to a long long or unsigned long long argument. +.El +.Ss Conversion Specifiers +Each conversion specifier results in fetching zero or more arguments. +The results are undefined if there are insufficient arguments for the +.Fa format . +If the +.Fa format +is exhausted while arguments remain, the excess arguments are ignored. +.Pp +The conversion specifiers and their meanings are: +.Bl -tag -width Ds +.It Sy d , D , o , O , x , X , u +The integer argument is converted to signed decimal +.Pq Sy d , D , +unsigned octal +.Pq Sy o , O , +unsigned hexadecimal +.Pq Sy x , X , +or unsigned decimal +.Pq Sy u , +respectively. +The letters +.Qq Sy abcdef +are used for +.Sy x +and letters +.Qq Sy ABCDEF +for +.Sy X +conversions. +.It Sy c +The character value of the argument is printed. +.It Sy b +The +.Sy %b +conversion specification allows bit values to be printed meaningfully. +Each +.Sy %b +takes an integer value and a format string from the argument list. +The first character of the format string should be the output base encoded as a +control character. +This base is used to print the integer argument. +The remaining groups of characters in the format string consist of a bit number +.Pq between 1 and 32, also encoded as a control character +and the next characters +.Pq up to the next control character or '\e0' +give the name of the bit field. +The string corresponding to the bit fields set in the integer argument is +printed after the numerical value. +.It Sy p +The argument is taken to be a pointer; the value of the pointer is printed in +unsigned hexadecimal. +The print format is equivalent to +.Sy %lx . +To avoid lint warnings, cast pointers to type +.Ft "void *" +when using the +.Sy %p +format specifier. +.It Sy s +The argument is taken to be a string +.Pq character pointer , +and characters from the string are printed until a null character is ecountered. +If the character pointer is +.Sy NULL , +the string +.Qq <null string> +is used in its place. +.It Sy % +Copy a +.Sy % ; +no argument is converted. +.El +.Sh CONTEXT +These functions can be called from user, kernel, interrupt, or +high-level interrupt context. +.Sh RETURN VALUES +.Fn sprintf +and +.Fn vsprintf +return +.Fa s . +.Pp +.Fn snprintf +and +.Fn vsnprintf +return the number of bytes that would have been written to +.Fa s +if +.Fa n +had been sufficiently large +.Pq excluding the terminating null byte . +.Sh SEE ALSO +.Xr cmn_err 9F , +.Xr va_arg 9F , +.Xr va_end 9F , +.Xr va_start 9F diff --git a/usr/src/man/man9f/vsprintf.9f b/usr/src/man/man9f/vsprintf.9f deleted file mode 100644 index 3de05d89a5..0000000000 --- a/usr/src/man/man9f/vsprintf.9f +++ /dev/null @@ -1,228 +0,0 @@ -'\" te -.\" Copyright (c) 2000, Sun Microsystems, Inc. -.\" All Rights Reserved -.\" 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] -.TH VSPRINTF 9F "May 6, 1996" -.SH NAME -vsprintf \- format characters in memory -.SH SYNOPSIS -.LP -.nf -#include <sys/varargs.h> - #include <sys/ddi.h> - #include <sys/sunddi.h> - - - -\fBchar *\fR\fBvsprintf\fR(\fBchar *\fR\fIbuf\fR, \fBconst char *\fR\fIfmt\fR, \fBva_list\fR \fIap\fR); -.fi - -.SH INTERFACE LEVEL -.sp -.LP -Solaris DDI specific (Solaris DDI). -.SH PARAMETERS -.sp -.ne 2 -.na -\fB\fIbuf\fR \fR -.ad -.RS 8n -Pointer to a character string. -.RE - -.sp -.ne 2 -.na -\fB\fIfmt\fR \fR -.ad -.RS 8n -Pointer to a character string. -.RE - -.sp -.ne 2 -.na -\fB\fIap\fR \fR -.ad -.RS 8n -Pointer to a variable argument list. -.RE - -.SH DESCRIPTION -.sp -.LP -\fBvsprintf()\fR builds a string in \fIbuf\fR under the control of the format -\fIfmt\fR. The format is a character string with either plain characters, which -are simply copied into \fIbuf\fR, or conversion specifications, each of which -converts zero or more arguments, again copied into \fIbuf\fR. The results are -unpredictable if there are insufficient arguments for the format; excess -arguments are simply ignored. It is the user's responsibility to ensure that -enough storage is available for \fIbuf\fR. -.sp -.LP -\fIap\fR contains the list of arguments used by the conversion specifications -in \fIfmt\fR. \fIap\fR is a variable argument list and must be initialized by -calling \fBva_start\fR(9F). \fBva_end\fR(9F) is used to clean up and must be -called after each traversal of the list. Multiple traversals of the argument -list, each bracketed by \fBva_start\fR(9F) and \fBva_end\fR(9F), are -possible. -.sp -.LP -Each conversion specification is introduced by the \fB%\fR character, after -which the following appear in sequence: -.sp -.LP -An optional decimal digit specifying a minimum field width for numeric -conversion. The converted value will be right-justified and padded with leading -zeroes if it has fewer characters than the minimum. -.sp -.LP -An optional \fBl\fR (\fBll\fR) specifying that a following \fBd\fR, \fBD\fR, -\fBo\fR, \fBO\fR, \fBx\fR, \fBX\fR, or \fBu\fR conversion character applies to -a \fBlong\fR (\fBlong long\fR) integer argument. An \fBl\fR (\fBll\fR) before -any other conversion character is ignored. -.sp -.LP -A character indicating the type of conversion to be applied: -.sp -.ne 2 -.na -\fB\fBd\fR,\fBD\fR,\fBo\fR,\fBO\fR,\fBx\fR,\fBX\fR,\fBu\fR\fR -.ad -.RS 17n -The integer argument is converted to signed decimal (\fBd\fR, \fBD\fR), -unsigned octal (\fBo\fR, \fBO\fR), unsigned hexadecimal (\fBx\fR, \fBX\fR) or -unsigned decimal (\fBu\fR), respectively, and copied. The letters \fBabcdef\fR -are used for \fBx\fR conversion. The letters \fBABCDEF\fR are used for \fBX\fR -conversion. -.RE - -.sp -.ne 2 -.na -\fB\fBc\fR\fR -.ad -.RS 17n -The character value of the argument is copied. -.RE - -.sp -.ne 2 -.na -\fB\fBb\fR\fR -.ad -.RS 17n -This conversion uses two additional arguments. The first is an integer, and is -converted according to the base specified in the second argument. The second -argument is a character string in the form -\fB<\fR\fIbase\fR\fB>[<\fR\fIarg\fR\fB>\|.\|.\|.\|].\fR The base supplies the -conversion base for the first argument as a binary value; \e10 gives octal, -\e20 gives hexadecimal. Each subsequent <arg> is a sequence of characters, the -first of which is the bit number to be tested, and subsequent characters, up to -the next bit number or terminating null, supply the name of the bit. -.RE - -.sp -.ne 2 -.na -\fB\fR -.ad -.RS 17n -A bit number is a binary-valued character in the range \fB1-32\fR. For each bit -set in the first argument, and named in the second argument, the bit names are -copied, separated by commas, and bracketed by \fB<\fR and \fB>\fR. Thus, the -following function call would generate \fBreg=3<BitTwo,BitOne>\en\fR in -\fIbuf\fR. -.RE - -.sp -.ne 2 -.na -\fB\fR -.ad -.RS 17n -\fBvsprintf(buf, "reg=%b\en", 3, "\e10\e2BitTwo\e1BitOne")\fR -.RE - -.sp -.ne 2 -.na -\fB\fBs\fR\fR -.ad -.RS 17n -The argument is taken to be a string (character pointer), and characters from -the string are copied until a null character is encountered. If the character -pointer is \fINULL\fR on \fBSPARC\fR, the string \fB<nullstring>\fR is used in -its place; on x86, it is undefined. -.RE - -.sp -.ne 2 -.na -\fB\fB%\fR\fR -.ad -.RS 17n -Copy a \fB%\fR; no argument is converted. -.RE - -.SH RETURN VALUES -.sp -.LP -\fBvsprintf()\fR returns its first parameter, \fIbuf\fR. -.SH CONTEXT -.sp -.LP -\fBvsprintf()\fR can be called from user, kernel, or interrupt context. -.SH EXAMPLES -.LP -\fBExample 1 \fRUsing \fBvsprintf()\fR -.sp -.LP -In this example, \fBxxerror()\fR accepts a pointer to a \fBdev_info_t\fR -structure \fBdip\fR, an error level \fBlevel\fR, a format \fBfmt\fR, and a -variable number of arguments. The routine uses \fBvsprintf()\fR to format the -error message in \fBbuf\fR. Note that \fBva_start\fR(9F) and \fBva_end\fR(9F) -bracket the call to \fBvsprintf()\fR. \fBinstance\fR, \fBlevel\fR, \fBname\fR, -and \fBbuf\fR are then passed to \fBcmn_err\fR(9F). - -.sp -.in +2 -.nf -#include <sys/varargs.h> -#include <sys/ddi.h> -#include <sys/sunddi.h> -#define MAX_MSG 256 - -void -xxerror(dev_info_t *dip, int level, const char *fmt, .\|.\|.\|) -{ - va_list ap; - int instance; - char buf[MAX_MSG], - *name; - - instance = ddi_get_instance(dip); - name = ddi_binding_name(dip); - - /* format buf using fmt and arguments contained in ap */ - va_start(ap, fmt); - vsprintf(buf, fmt, ap); - va_end(ap); - - /* pass formatted string to cmn_err(9F) */ - cmn_err(level, "%s%d: %s", name, instance, buf); -} -.fi -.in -2 - -.SH SEE ALSO -.sp -.LP -\fBcmn_err\fR(9F), \fBddi_binding_name\fR(9F), \fBddi_get_instance\fR(9F), -\fBva_arg\fR(9F) -.sp -.LP -\fIWriting Device Drivers\fR diff --git a/usr/src/pkg/manifests/system-kernel.man9f.inc b/usr/src/pkg/manifests/system-kernel.man9f.inc index 3fb8b3c58b..9733730173 100644 --- a/usr/src/pkg/manifests/system-kernel.man9f.inc +++ b/usr/src/pkg/manifests/system-kernel.man9f.inc @@ -471,6 +471,7 @@ file path=usr/share/man/man9f/scsi_unprobe.9f file path=usr/share/man/man9f/scsi_validate_sense.9f file path=usr/share/man/man9f/scsi_vu_errmsg.9f file path=usr/share/man/man9f/semaphore.9f +file path=usr/share/man/man9f/sprintf.9f file path=usr/share/man/man9f/stoi.9f file path=usr/share/man/man9f/string.9f file path=usr/share/man/man9f/strlog.9f @@ -491,7 +492,6 @@ file path=usr/share/man/man9f/untimeout.9f file path=usr/share/man/man9f/ureadc.9f file path=usr/share/man/man9f/uwritec.9f file path=usr/share/man/man9f/va_arg.9f -file path=usr/share/man/man9f/vsprintf.9f link path=usr/share/man/man9f/AVL_NEXT.9f target=avl.9f link path=usr/share/man/man9f/AVL_PREV.9f target=avl.9f link path=usr/share/man/man9f/SIZEOF_PTR.9f target=STRUCT_DECL.9f @@ -908,13 +908,13 @@ link path=usr/share/man/man9f/dlerrorack.9f target=dlbindack.9f link path=usr/share/man/man9f/dlokack.9f target=dlbindack.9f link path=usr/share/man/man9f/dlphysaddrack.9f target=dlbindack.9f link path=usr/share/man/man9f/dluderrorind.9f target=dlbindack.9f -link path=usr/share/man/man9f/free_pktiopb.9f target=get_pktiopb.9f link path=usr/share/man/man9f/firmware_close.9f target=firmload.9f link path=usr/share/man/man9f/firmware_free.9f target=firmload.9f link path=usr/share/man/man9f/firmware_get_size.9f target=firmload.9f link path=usr/share/man/man9f/firmware_malloc.9f target=firmload.9f link path=usr/share/man/man9f/firmware_open.9f target=firmload.9f link path=usr/share/man/man9f/firmware_read.9f target=firmload.9f +link path=usr/share/man/man9f/free_pktiopb.9f target=get_pktiopb.9f link path=usr/share/man/man9f/gld_intr.9f target=gld.9f link path=usr/share/man/man9f/gld_mac_alloc.9f target=gld.9f link path=usr/share/man/man9f/gld_mac_free.9f target=gld.9f @@ -1274,6 +1274,7 @@ link path=usr/share/man/man9f/sema_p.9f target=semaphore.9f link path=usr/share/man/man9f/sema_p_sig.9f target=semaphore.9f link path=usr/share/man/man9f/sema_tryp.9f target=semaphore.9f link path=usr/share/man/man9f/sema_v.9f target=semaphore.9f +link path=usr/share/man/man9f/snprintf.9f target=sprintf.9f link path=usr/share/man/man9f/strcasecmp.9f target=string.9f link path=usr/share/man/man9f/strcat.9f target=string.9f link path=usr/share/man/man9f/strchr.9f target=string.9f @@ -1302,6 +1303,8 @@ link path=usr/share/man/man9f/va_copy.9f target=va_arg.9f link path=usr/share/man/man9f/va_end.9f target=va_arg.9f link path=usr/share/man/man9f/va_start.9f target=va_arg.9f link path=usr/share/man/man9f/vcmn_err.9f target=cmn_err.9f +link path=usr/share/man/man9f/vsnprintf.9f target=sprintf.9f +link path=usr/share/man/man9f/vsprintf.9f target=sprintf.9f link path=usr/share/man/man9f/vzcmn_err.9f target=cmn_err.9f link path=usr/share/man/man9f/wr.9f target=WR.9f link path=usr/share/man/man9f/zcmn_err.9f target=cmn_err.9f diff --git a/usr/src/uts/common/net/if_dl.h b/usr/src/uts/common/net/if_dl.h index a4810cb793..675d19a264 100644 --- a/usr/src/uts/common/net/if_dl.h +++ b/usr/src/uts/common/net/if_dl.h @@ -38,7 +38,6 @@ #ifndef _NET_IF_DL_H #define _NET_IF_DL_H -#pragma ident "%Z%%M% %I% %E% SMI" /* from UCB 8.1 (Berkeley) 6/10/93 */ #ifdef __cplusplus diff --git a/usr/src/uts/common/sys/aio_req.h b/usr/src/uts/common/sys/aio_req.h index 5569f411c1..9619b72d00 100644 --- a/usr/src/uts/common/sys/aio_req.h +++ b/usr/src/uts/common/sys/aio_req.h @@ -26,8 +26,6 @@ #ifndef _SYS_AIO_REQ_H #define _SYS_AIO_REQ_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/buf.h> #ifdef __cplusplus diff --git a/usr/src/uts/common/sys/avl_impl.h b/usr/src/uts/common/sys/avl_impl.h index 620685f370..4522895cc2 100644 --- a/usr/src/uts/common/sys/avl_impl.h +++ b/usr/src/uts/common/sys/avl_impl.h @@ -27,8 +27,6 @@ #ifndef _AVL_IMPL_H #define _AVL_IMPL_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This is a private header file. Applications should not directly include * this file. diff --git a/usr/src/uts/common/sys/contract.h b/usr/src/uts/common/sys/contract.h index faf4f62529..0e81f8ffbf 100644 --- a/usr/src/uts/common/sys/contract.h +++ b/usr/src/uts/common/sys/contract.h @@ -26,8 +26,6 @@ #ifndef _SYS_CONTRACT_H #define _SYS_CONTRACT_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #ifdef __cplusplus diff --git a/usr/src/uts/common/sys/copyops.h b/usr/src/uts/common/sys/copyops.h index e04c92bd3a..54b754eaa2 100644 --- a/usr/src/uts/common/sys/copyops.h +++ b/usr/src/uts/common/sys/copyops.h @@ -27,8 +27,6 @@ #ifndef _SYS_COPYOPS_H #define _SYS_COPYOPS_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/thread.h> #include <sys/buf.h> diff --git a/usr/src/uts/common/sys/dacf.h b/usr/src/uts/common/sys/dacf.h index b6b7124870..80cc30a94f 100644 --- a/usr/src/uts/common/sys/dacf.h +++ b/usr/src/uts/common/sys/dacf.h @@ -26,8 +26,6 @@ #ifndef _DACF_H #define _DACF_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Device autoconfiguration framework (dacf) */ diff --git a/usr/src/uts/common/sys/dacf_impl.h b/usr/src/uts/common/sys/dacf_impl.h index af32afad30..0d30ae061c 100644 --- a/usr/src/uts/common/sys/dacf_impl.h +++ b/usr/src/uts/common/sys/dacf_impl.h @@ -27,8 +27,6 @@ #ifndef _DACF_IMPL_H #define _DACF_IMPL_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Implementation-Private definitions for Device autoconfiguration (dacf) */ diff --git a/usr/src/uts/common/sys/ddifm.h b/usr/src/uts/common/sys/ddifm.h index 07fc00754f..ef2dc453c8 100644 --- a/usr/src/uts/common/sys/ddifm.h +++ b/usr/src/uts/common/sys/ddifm.h @@ -26,8 +26,6 @@ #ifndef _DDIFM_H #define _DDIFM_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/door_impl.h b/usr/src/uts/common/sys/door_impl.h index ea5c22465e..1210f8a16c 100644 --- a/usr/src/uts/common/sys/door_impl.h +++ b/usr/src/uts/common/sys/door_impl.h @@ -27,8 +27,6 @@ #ifndef _SYS_DOOR_IMPL_H #define _SYS_DOOR_IMPL_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Common definitions for <sys/door.h> and <sys/proc.h>. */ diff --git a/usr/src/uts/common/sys/errno.h b/usr/src/uts/common/sys/errno.h index 406cfb4c5d..063611d8ef 100644 --- a/usr/src/uts/common/sys/errno.h +++ b/usr/src/uts/common/sys/errno.h @@ -40,8 +40,6 @@ #ifndef _SYS_ERRNO_H #define _SYS_ERRNO_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/errorq.h b/usr/src/uts/common/sys/errorq.h index 971b19e6cc..5ae6f9e901 100644 --- a/usr/src/uts/common/sys/errorq.h +++ b/usr/src/uts/common/sys/errorq.h @@ -27,8 +27,6 @@ #ifndef _ERRORQ_H #define _ERRORQ_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/time.h> #include <sys/nvpair.h> diff --git a/usr/src/uts/common/sys/hwconf.h b/usr/src/uts/common/sys/hwconf.h index 4e9966a7b7..af240461a4 100644 --- a/usr/src/uts/common/sys/hwconf.h +++ b/usr/src/uts/common/sys/hwconf.h @@ -27,8 +27,6 @@ #ifndef _SYS_HWCONF_H #define _SYS_HWCONF_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/dditypes.h> #include <sys/ddipropdefs.h> diff --git a/usr/src/uts/common/sys/inttypes.h b/usr/src/uts/common/sys/inttypes.h index ebf4cadb0b..8bf21a1b85 100644 --- a/usr/src/uts/common/sys/inttypes.h +++ b/usr/src/uts/common/sys/inttypes.h @@ -27,8 +27,6 @@ #ifndef _SYS_INTTYPES_H #define _SYS_INTTYPES_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This header, <sys/inttypes.h>, contains (through nested inclusion) the * vast majority of the facilities specified for <inttypes.h> as defined diff --git a/usr/src/uts/common/sys/ioctl.h b/usr/src/uts/common/sys/ioctl.h index 9728c896c0..9fba15d031 100644 --- a/usr/src/uts/common/sys/ioctl.h +++ b/usr/src/uts/common/sys/ioctl.h @@ -30,8 +30,6 @@ #ifndef _SYS_IOCTL_H #define _SYS_IOCTL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/ipc_rctl.h b/usr/src/uts/common/sys/ipc_rctl.h index 42ec222a77..f1c8303e19 100644 --- a/usr/src/uts/common/sys/ipc_rctl.h +++ b/usr/src/uts/common/sys/ipc_rctl.h @@ -26,8 +26,6 @@ #ifndef _SYS_IPC_RCTL_H #define _SYS_IPC_RCTL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/rctl.h> #ifdef __cplusplus diff --git a/usr/src/uts/common/sys/kiconv.h b/usr/src/uts/common/sys/kiconv.h index aa342ae02f..46dcb4467d 100644 --- a/usr/src/uts/common/sys/kiconv.h +++ b/usr/src/uts/common/sys/kiconv.h @@ -26,8 +26,6 @@ #ifndef _SYS_KICONV_H #define _SYS_KICONV_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/ksynch.h b/usr/src/uts/common/sys/ksynch.h index 6befc77818..3b627b6f6b 100644 --- a/usr/src/uts/common/sys/ksynch.h +++ b/usr/src/uts/common/sys/ksynch.h @@ -30,8 +30,6 @@ #ifndef _SYS_KSYNCH_H #define _SYS_KSYNCH_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * The presence of this file is specified by the DKI/DDI. */ diff --git a/usr/src/uts/common/sys/list.h b/usr/src/uts/common/sys/list.h index 8339b6226d..6db92ed429 100644 --- a/usr/src/uts/common/sys/list.h +++ b/usr/src/uts/common/sys/list.h @@ -26,8 +26,6 @@ #ifndef _SYS_LIST_H #define _SYS_LIST_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/list_impl.h> #ifdef __cplusplus diff --git a/usr/src/uts/common/sys/list_impl.h b/usr/src/uts/common/sys/list_impl.h index 9c42f88320..a6614f9a38 100644 --- a/usr/src/uts/common/sys/list_impl.h +++ b/usr/src/uts/common/sys/list_impl.h @@ -27,8 +27,6 @@ #ifndef _SYS_LIST_IMPL_H #define _SYS_LIST_IMPL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #ifdef __cplusplus diff --git a/usr/src/uts/common/sys/md5.h b/usr/src/uts/common/sys/md5.h index 798f1bd2e2..1781654cc9 100644 --- a/usr/src/uts/common/sys/md5.h +++ b/usr/src/uts/common/sys/md5.h @@ -37,8 +37,6 @@ #ifndef _SYS_MD5_H #define _SYS_MD5_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> /* for uint_* */ /* diff --git a/usr/src/uts/common/sys/model.h b/usr/src/uts/common/sys/model.h index f9f71b349d..d3286ad1ec 100644 --- a/usr/src/uts/common/sys/model.h +++ b/usr/src/uts/common/sys/model.h @@ -27,8 +27,6 @@ #ifndef _SYS_MODEL_H #define _SYS_MODEL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/msacct.h b/usr/src/uts/common/sys/msacct.h index 97a58d9b8e..426f359b0f 100644 --- a/usr/src/uts/common/sys/msacct.h +++ b/usr/src/uts/common/sys/msacct.h @@ -27,8 +27,6 @@ #ifndef _SYS_MSACCT_H #define _SYS_MSACCT_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/ndifm.h b/usr/src/uts/common/sys/ndifm.h index bc94e8f79f..962fee08c9 100644 --- a/usr/src/uts/common/sys/ndifm.h +++ b/usr/src/uts/common/sys/ndifm.h @@ -27,8 +27,6 @@ #ifndef _SYS_NDIFM_H #define _SYS_NDIFM_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/nexusdefs.h b/usr/src/uts/common/sys/nexusdefs.h index e05df8e4f0..fb0f41a2b8 100644 --- a/usr/src/uts/common/sys/nexusdefs.h +++ b/usr/src/uts/common/sys/nexusdefs.h @@ -27,8 +27,6 @@ #ifndef _SYS_NEXUSDEFS_H #define _SYS_NEXUSDEFS_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/note.h b/usr/src/uts/common/sys/note.h index 2cb7fd89b7..6625b68d9e 100644 --- a/usr/src/uts/common/sys/note.h +++ b/usr/src/uts/common/sys/note.h @@ -39,8 +39,6 @@ #ifndef _SYS_NOTE_H #define _SYS_NOTE_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/procset.h b/usr/src/uts/common/sys/procset.h index c3b5867574..66076d8ca9 100644 --- a/usr/src/uts/common/sys/procset.h +++ b/usr/src/uts/common/sys/procset.h @@ -31,8 +31,6 @@ #ifndef _SYS_PROCSET_H #define _SYS_PROCSET_H -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6 */ - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/rwstlock.h b/usr/src/uts/common/sys/rwstlock.h index 17fc9b6a67..c491aef82a 100644 --- a/usr/src/uts/common/sys/rwstlock.h +++ b/usr/src/uts/common/sys/rwstlock.h @@ -27,8 +27,6 @@ #ifndef _SYS_RWSTLOCK_H #define _SYS_RWSTLOCK_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Alternate rwlock that is interruptible and can be released by a thread * other than the one that acquired the lock. diff --git a/usr/src/uts/common/sys/semaphore.h b/usr/src/uts/common/sys/semaphore.h index 5ab71b890b..0bfb5d1ce4 100644 --- a/usr/src/uts/common/sys/semaphore.h +++ b/usr/src/uts/common/sys/semaphore.h @@ -27,8 +27,6 @@ #ifndef _SYS_SEMAPHORE_H #define _SYS_SEMAPHORE_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Public interface to semaphores. See semaphore(9F) for details. */ diff --git a/usr/src/uts/common/sys/siginfo.h b/usr/src/uts/common/sys/siginfo.h index f6268dd8a5..c8721c3c95 100644 --- a/usr/src/uts/common/sys/siginfo.h +++ b/usr/src/uts/common/sys/siginfo.h @@ -30,8 +30,6 @@ #ifndef _SYS_SIGINFO_H #define _SYS_SIGINFO_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/feature_tests.h> #include <sys/types.h> diff --git a/usr/src/uts/common/sys/stdint.h b/usr/src/uts/common/sys/stdint.h index 1e6808f3c5..ec1656055f 100644 --- a/usr/src/uts/common/sys/stdint.h +++ b/usr/src/uts/common/sys/stdint.h @@ -27,8 +27,6 @@ #ifndef _SYS_STDINT_H #define _SYS_STDINT_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This header is included by <stdint.h> which was introduced by * the ISO C Standard, ISO/IEC 9899:1999 Programming language - C. diff --git a/usr/src/uts/common/sys/strmdep.h b/usr/src/uts/common/sys/strmdep.h index 3d246e44e6..f9d70022db 100644 --- a/usr/src/uts/common/sys/strmdep.h +++ b/usr/src/uts/common/sys/strmdep.h @@ -31,8 +31,6 @@ #ifndef _SYS_STRMDEP_H #define _SYS_STRMDEP_H -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.3 */ - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/synch.h b/usr/src/uts/common/sys/synch.h index 6431bf22bc..c32f3217ad 100644 --- a/usr/src/uts/common/sys/synch.h +++ b/usr/src/uts/common/sys/synch.h @@ -27,8 +27,6 @@ #ifndef _SYS_SYNCH_H #define _SYS_SYNCH_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifndef _ASM #include <sys/types.h> #include <sys/int_types.h> diff --git a/usr/src/uts/common/sys/t_lock.h b/usr/src/uts/common/sys/t_lock.h index 01ac64b290..34b0ad9d34 100644 --- a/usr/src/uts/common/sys/t_lock.h +++ b/usr/src/uts/common/sys/t_lock.h @@ -33,8 +33,6 @@ #ifndef _SYS_T_LOCK_H #define _SYS_T_LOCK_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifndef _ASM #include <sys/machlock.h> #include <sys/param.h> diff --git a/usr/src/uts/common/sys/ttydev.h b/usr/src/uts/common/sys/ttydev.h index 29c9c4a564..772b7d06b8 100644 --- a/usr/src/uts/common/sys/ttydev.h +++ b/usr/src/uts/common/sys/ttydev.h @@ -26,8 +26,6 @@ #ifndef _SYS_TTYDEV_H #define _SYS_TTYDEV_H -#pragma ident "%Z%%M% %I% %E% SMI" /* UCB 4.3 83/05/18 */ - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/types32.h b/usr/src/uts/common/sys/types32.h index daa27eaf76..32af133581 100644 --- a/usr/src/uts/common/sys/types32.h +++ b/usr/src/uts/common/sys/types32.h @@ -26,8 +26,6 @@ #ifndef _SYS_TYPES32_H #define _SYS_TYPES32_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/int_types.h> #ifdef __cplusplus diff --git a/usr/src/uts/common/sys/tzfile.h b/usr/src/uts/common/sys/tzfile.h index 8f451f27d9..66e3c72a70 100644 --- a/usr/src/uts/common/sys/tzfile.h +++ b/usr/src/uts/common/sys/tzfile.h @@ -30,8 +30,6 @@ #ifndef _SYS_TZFILE_H #define _SYS_TZFILE_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/u8_textprep.h b/usr/src/uts/common/sys/u8_textprep.h index e30f064b2d..acbcdb03e4 100644 --- a/usr/src/uts/common/sys/u8_textprep.h +++ b/usr/src/uts/common/sys/u8_textprep.h @@ -26,8 +26,6 @@ #ifndef _SYS_U8_TEXTPREP_H #define _SYS_U8_TEXTPREP_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/isa_defs.h> #include <sys/types.h> #include <sys/errno.h> diff --git a/usr/src/uts/common/sys/uuid.h b/usr/src/uts/common/sys/uuid.h index 683643e312..9ce872e345 100644 --- a/usr/src/uts/common/sys/uuid.h +++ b/usr/src/uts/common/sys/uuid.h @@ -27,8 +27,6 @@ #ifndef _SYS_UUID_H #define _SYS_UUID_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/sys/watchpoint.h b/usr/src/uts/common/sys/watchpoint.h index c92a50557a..36eb3addc2 100644 --- a/usr/src/uts/common/sys/watchpoint.h +++ b/usr/src/uts/common/sys/watchpoint.h @@ -27,8 +27,6 @@ #ifndef _SYS_WATCHPOINT_H #define _SYS_WATCHPOINT_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <vm/seg_enum.h> #include <sys/copyops.h> diff --git a/usr/src/uts/common/vm/faultcode.h b/usr/src/uts/common/vm/faultcode.h index f5f12f065a..18d709f657 100644 --- a/usr/src/uts/common/vm/faultcode.h +++ b/usr/src/uts/common/vm/faultcode.h @@ -39,8 +39,6 @@ #ifndef _VM_FAULTCODE_H #define _VM_FAULTCODE_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/common/vm/seg_enum.h b/usr/src/uts/common/vm/seg_enum.h index 5c37e2b178..fedb6fd983 100644 --- a/usr/src/uts/common/vm/seg_enum.h +++ b/usr/src/uts/common/vm/seg_enum.h @@ -33,8 +33,6 @@ #ifndef _VM_SEG_ENUM_H #define _VM_SEG_ENUM_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/i86pc/os/machdep.c b/usr/src/uts/i86pc/os/machdep.c index 975cd7532e..674e6e2bbc 100644 --- a/usr/src/uts/i86pc/os/machdep.c +++ b/usr/src/uts/i86pc/os/machdep.c @@ -427,15 +427,19 @@ abort_sequence_enter(char *msg) /* * Enter debugger. Called when the user types ctrl-alt-d or whenever * code wants to enter the debugger and possibly resume later. + * + * msg: message to print, possibly NULL. */ void -debug_enter( - char *msg) /* message to print, possibly NULL */ +debug_enter(char *msg) { if (dtrace_debugger_init != NULL) (*dtrace_debugger_init)(); - if (msg) + if (msg != NULL || (boothowto & RB_DEBUG)) + prom_printf("\n"); + + if (msg != NULL) prom_printf("%s\n", msg); if (boothowto & RB_DEBUG) diff --git a/usr/src/uts/intel/ia32/sys/machtypes.h b/usr/src/uts/intel/ia32/sys/machtypes.h index c4cbd311dd..232b03028c 100644 --- a/usr/src/uts/intel/ia32/sys/machtypes.h +++ b/usr/src/uts/intel/ia32/sys/machtypes.h @@ -26,8 +26,6 @@ #ifndef _IA32_SYS_MACHTYPES_H #define _IA32_SYS_MACHTYPES_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/intel/ia32/sys/privregs.h b/usr/src/uts/intel/ia32/sys/privregs.h index a1b5e0ae9f..44d8f71aab 100644 --- a/usr/src/uts/intel/ia32/sys/privregs.h +++ b/usr/src/uts/intel/ia32/sys/privregs.h @@ -27,8 +27,6 @@ #ifndef _IA32_SYS_PRIVREGS_H #define _IA32_SYS_PRIVREGS_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/intel/sys/machsig.h b/usr/src/uts/intel/sys/machsig.h index 7839195538..f4829bef2a 100644 --- a/usr/src/uts/intel/sys/machsig.h +++ b/usr/src/uts/intel/sys/machsig.h @@ -31,8 +31,6 @@ #ifndef _SYS_MACHSIG_H #define _SYS_MACHSIG_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/feature_tests.h> #ifdef __cplusplus diff --git a/usr/src/uts/intel/sys/machtypes.h b/usr/src/uts/intel/sys/machtypes.h index 3237c99889..05ad8896d4 100644 --- a/usr/src/uts/intel/sys/machtypes.h +++ b/usr/src/uts/intel/sys/machtypes.h @@ -27,8 +27,6 @@ #ifndef _SYS_MACHTYPES_H #define _SYS_MACHTYPES_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/feature_tests.h> #if defined(__i386) || defined(__amd64) diff --git a/usr/src/uts/intel/sys/obpdefs.h b/usr/src/uts/intel/sys/obpdefs.h index 9de8421016..67fce65ef6 100644 --- a/usr/src/uts/intel/sys/obpdefs.h +++ b/usr/src/uts/intel/sys/obpdefs.h @@ -27,8 +27,6 @@ #ifndef _SYS_OBPDEFS_H #define _SYS_OBPDEFS_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/intel/sys/privregs.h b/usr/src/uts/intel/sys/privregs.h index 375dcd726f..c428e81bef 100644 --- a/usr/src/uts/intel/sys/privregs.h +++ b/usr/src/uts/intel/sys/privregs.h @@ -27,8 +27,6 @@ #ifndef _SYS_PRIVREGS_H #define _SYS_PRIVREGS_H -#pragma ident "%Z%%M% %I% %E% SMI" - #if defined(__amd64) #include <amd64/sys/privregs.h> diff --git a/usr/src/uts/intel/sys/utrap.h b/usr/src/uts/intel/sys/utrap.h index 487dcbb23a..fc018eb2f1 100644 --- a/usr/src/uts/intel/sys/utrap.h +++ b/usr/src/uts/intel/sys/utrap.h @@ -27,8 +27,6 @@ #ifndef _UTRAP_H #define _UTRAP_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/sparc/sys/ddi_isa.h b/usr/src/uts/sparc/sys/ddi_isa.h index f03d5c9200..8ef2540df6 100644 --- a/usr/src/uts/sparc/sys/ddi_isa.h +++ b/usr/src/uts/sparc/sys/ddi_isa.h @@ -26,8 +26,6 @@ #ifndef _SYS_DDI_ISA_H #define _SYS_DDI_ISA_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/isa_defs.h> #include <sys/ndifm.h> #include <sys/dditypes.h> @@ -160,62 +158,62 @@ i_ddi_swap_put64(ddi_acc_impl_t *hdlp, uint64_t *addr, uint64_t value); */ void i_ddi_rep_get8(ddi_acc_impl_t *hdlp, uint8_t *host_addr, uint8_t *dev_addr, - size_t repcount, uint_t flags); + size_t repcount, uint_t flags); void i_ddi_rep_get16(ddi_acc_impl_t *hdlp, uint16_t *host_addr, uint16_t *dev_addr, - size_t repcount, uint_t flags); + size_t repcount, uint_t flags); void i_ddi_rep_get32(ddi_acc_impl_t *hdlp, uint32_t *host_addr, uint32_t *dev_addr, - size_t repcount, uint_t flags); + size_t repcount, uint_t flags); void i_ddi_rep_get64(ddi_acc_impl_t *hdlp, uint64_t *host_addr, uint64_t *dev_addr, - size_t repcount, uint_t flags); + size_t repcount, uint_t flags); void i_ddi_swap_rep_get16(ddi_acc_impl_t *hdlp, uint16_t *host_addr, - uint16_t *dev_addr, size_t repcount, uint_t flags); + uint16_t *dev_addr, size_t repcount, uint_t flags); void i_ddi_swap_rep_get32(ddi_acc_impl_t *hdlp, uint32_t *host_addr, - uint32_t *dev_addr, size_t repcount, uint_t flags); + uint32_t *dev_addr, size_t repcount, uint_t flags); void i_ddi_swap_rep_get64(ddi_acc_impl_t *hdlp, uint64_t *host_addr, - uint64_t *dev_addr, size_t repcount, uint_t flags); + uint64_t *dev_addr, size_t repcount, uint_t flags); /* * Repeated output functions for memory mapped IO */ void i_ddi_rep_put8(ddi_acc_impl_t *hdlp, uint8_t *host_addr, uint8_t *dev_addr, - size_t repcount, uint_t flags); + size_t repcount, uint_t flags); void i_ddi_rep_put16(ddi_acc_impl_t *hdlp, uint16_t *host_addr, uint16_t *dev_addr, - size_t repcount, uint_t flags); + size_t repcount, uint_t flags); void i_ddi_rep_put32(ddi_acc_impl_t *hdl, uint32_t *host_addr, uint32_t *dev_addr, - size_t repcount, uint_t flags); + size_t repcount, uint_t flags); void i_ddi_rep_put64(ddi_acc_impl_t *hdl, uint64_t *host_addr, uint64_t *dev_addr, - size_t repcount, uint_t flags); + size_t repcount, uint_t flags); void i_ddi_swap_rep_put16(ddi_acc_impl_t *hdlp, uint16_t *host_addr, - uint16_t *dev_addr, size_t repcount, uint_t flags); + uint16_t *dev_addr, size_t repcount, uint_t flags); void i_ddi_swap_rep_put32(ddi_acc_impl_t *hdl, uint32_t *host_addr, - uint32_t *dev_addr, size_t repcount, uint_t flags); + uint32_t *dev_addr, size_t repcount, uint_t flags); void i_ddi_swap_rep_put64(ddi_acc_impl_t *hdl, uint64_t *host_addr, - uint64_t *dev_addr, size_t repcount, uint_t flags); + uint64_t *dev_addr, size_t repcount, uint_t flags); /* * Default fault-checking and notification functions diff --git a/usr/src/uts/sparc/sys/machlock.h b/usr/src/uts/sparc/sys/machlock.h index 72664a37b5..f317df4ab4 100644 --- a/usr/src/uts/sparc/sys/machlock.h +++ b/usr/src/uts/sparc/sys/machlock.h @@ -26,8 +26,6 @@ #ifndef _SYS_MACHLOCK_H #define _SYS_MACHLOCK_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/sparc/sys/machsig.h b/usr/src/uts/sparc/sys/machsig.h index e4bbaab342..1a53e47083 100644 --- a/usr/src/uts/sparc/sys/machsig.h +++ b/usr/src/uts/sparc/sys/machsig.h @@ -31,8 +31,6 @@ #ifndef _SYS_MACHSIG_H #define _SYS_MACHSIG_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/feature_tests.h> #ifdef __cplusplus diff --git a/usr/src/uts/sparc/sys/machtypes.h b/usr/src/uts/sparc/sys/machtypes.h index 574a533831..6fe7676f06 100644 --- a/usr/src/uts/sparc/sys/machtypes.h +++ b/usr/src/uts/sparc/sys/machtypes.h @@ -31,8 +31,6 @@ #ifndef _SYS_MACHTYPES_H #define _SYS_MACHTYPES_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/feature_tests.h> #ifdef __cplusplus diff --git a/usr/src/uts/sparc/sys/stat_impl.h b/usr/src/uts/sparc/sys/stat_impl.h index 4b351b9cec..e17d5343ca 100644 --- a/usr/src/uts/sparc/sys/stat_impl.h +++ b/usr/src/uts/sparc/sys/stat_impl.h @@ -27,8 +27,6 @@ #ifndef _SYS_STAT_IMPL_H #define _SYS_STAT_IMPL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/feature_tests.h> #include <sys/types.h> diff --git a/usr/src/uts/sparc/sys/utrap.h b/usr/src/uts/sparc/sys/utrap.h index 4dc0573f23..eb819c3391 100644 --- a/usr/src/uts/sparc/sys/utrap.h +++ b/usr/src/uts/sparc/sys/utrap.h @@ -27,8 +27,6 @@ #ifndef _UTRAP_H #define _UTRAP_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -88,7 +86,7 @@ typedef void *utrap_handler_t; /* user trap handler entry point */ #ifdef __sparcv8plus int install_utrap(utrap_entry_t type, utrap_handler_t new_handler, - utrap_handler_t *old_handlerp); + utrap_handler_t *old_handlerp); #endif /* __sparcv8plus */ #ifdef _KERNEL @@ -100,8 +98,8 @@ void utrap_free(struct proc *p); #ifdef __sparcv9 int __sparc_utrap_install(utrap_entry_t type, - utrap_handler_t new_precise, utrap_handler_t new_deferred, - utrap_handler_t *old_precise, utrap_handler_t *old_deferred); + utrap_handler_t new_precise, utrap_handler_t new_deferred, + utrap_handler_t *old_precise, utrap_handler_t *old_deferred); #endif /* The trap_instruction user traps are precise only. */ diff --git a/usr/src/uts/sparc/v7/sys/privregs.h b/usr/src/uts/sparc/v7/sys/privregs.h index bf58558ba2..59a22369f5 100644 --- a/usr/src/uts/sparc/v7/sys/privregs.h +++ b/usr/src/uts/sparc/v7/sys/privregs.h @@ -27,8 +27,6 @@ #ifndef _SYS_PRIVREGS_H #define _SYS_PRIVREGS_H -#pragma ident "%Z%%M% %I% %E% SMI" /* from SunOS psl.h 1.2 */ - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/sun/sys/obpdefs.h b/usr/src/uts/sun/sys/obpdefs.h index 2a9fb15989..909c18db64 100644 --- a/usr/src/uts/sun/sys/obpdefs.h +++ b/usr/src/uts/sun/sys/obpdefs.h @@ -26,8 +26,6 @@ #ifndef _SYS_OBPDEFS_H #define _SYS_OBPDEFS_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif |