Date: Sun, 11 May 2003 19:17:43 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30988 for review Message-ID: <200305120217.h4C2HhFB039760@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30988 Change 30988 by peter@peter_hammer on 2003/05/11 19:17:42 IFC @30987 Affected files ... .. //depot/projects/hammer/share/man/man4/umass.4#6 integrate .. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#1 branch .. //depot/projects/hammer/sys/dev/firewire/sbp.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/hammer/usr.bin/stat/stat.1#3 integrate .. //depot/projects/hammer/usr.bin/stat/stat.c#4 integrate Differences ... ==== //depot/projects/hammer/share/man/man4/umass.4#6 (text+ko) ==== @@ -25,7 +25,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/umass.4,v 1.27 2003/04/07 11:26:54 murray Exp $ +.\" $FreeBSD: src/share/man/man4/umass.4,v 1.28 2003/05/11 23:55:27 joe Exp $ .\" .Dd May 3, 1999 .Dt UMASS 4 @@ -69,6 +69,13 @@ Sitecom CN-300 MultiFlash (MMC/SD, SmartMedia, CF, MemoryStick) .El .Pp +Among the supported digital cameras are: +.Pp +.Bl -item -compact +.It +Asahi Optical (PENTAX) Optio 230 & 330 +.El +.Pp .Nm usb and one of .Nm uhci ==== //depot/projects/hammer/sys/dev/firewire/sbp.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.50 2003/05/05 14:50:24 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.51 2003/05/12 00:42:28 simokawa Exp $ * */ @@ -2304,10 +2304,18 @@ } SBP_DEBUG(1) printf("%s:%d:%d:%d:XPT_CALC_GEOMETRY: " +#if __FreeBSD_version >= 500000 "Volume size = %jd\n", - device_get_nameunit(sbp->fd.dev), cam_sim_path(sbp->sim), +#else + "Volume size = %d\n", +#endif + device_get_nameunit(sbp->fd.dev), + cam_sim_path(sbp->sim), ccb->ccb_h.target_id, ccb->ccb_h.target_lun, - (uintmax_t)ccg->volume_size); +#if __FreeBSD_version >= 500000 + (uintmax_t) +#endif + ccg->volume_size); END_DEBUG size_mb = ccg->volume_size ==== //depot/projects/hammer/sys/dev/usb/umass.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.80 2003/04/14 14:28:17 ticso Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.81 2003/05/11 23:55:27 joe Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -313,6 +313,11 @@ UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I, RS_NO_CLEAR_UA }, + { USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO330, + RID_WILDCARD, + UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I, + RS_NO_CLEAR_UA + }, { USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100, RID_WILDCARD, UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I, RS_NO_CLEAR_UA ==== //depot/projects/hammer/sys/dev/usb/usbdevs#9 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.123 2003/05/05 08:18:53 murray Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.124 2003/05/11 23:55:28 joe Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -455,6 +455,7 @@ /* Asahi Optical products */ product ASAHIOPTICAL OPTIO230 0x0004 Digital camera +product ASAHIOPTICAL OPTIO330 0x0006 Digital camera /* ASIX Electronics products */ product ASIX AX88172 0x1720 USB 2.0 10/100 ethernet controller ==== //depot/projects/hammer/usr.bin/stat/stat.1#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $NetBSD: stat.1,v 1.5 2002/07/08 18:48:42 atatat Exp $ +.\" $NetBSD: stat.1,v 1.11 2003/05/08 13:07:10 wiz Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -34,9 +34,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.bin/stat/stat.1,v 1.3 2002/08/13 20:07:36 dougb Exp $ +.\" $FreeBSD: src/usr.bin/stat/stat.1,v 1.4 2003/05/11 23:07:07 dougb Exp $ .\" -.Dd April 24, 2002 +.Dd May 8, 2003 .Dt STAT 1 .Os .Sh NAME @@ -65,14 +65,15 @@ .Ar file . Read, write or execute permissions of the named file are not required, but all directories listed in the path name leading to the file must be -searchable. If no argument is given, +searchable. +If no argument is given, .Nm displays information about the file descriptor for standard input. .Pp When invoked as .Nm readlink , -only the target of the symbolic link is printed. If the given argument -is not a symbolic link, +only the target of the symbolic link is printed. +If the given argument is not a symbolic link, .Nm readlink will print nothing and exit with an error. .Pp @@ -88,7 +89,8 @@ display a slash (/) immediately after each pathname that is a directory, an asterisk (*) after each that is executable, an at sign (@) after each symbolic link, a percent sign (%) after each whiteout, an equal sign (=) after each -socket, and a vertical bar (|) after each that is a FIFO. The use of +socket, and a vertical bar (|) after each that is a FIFO. +The use of .Fl F implies .Fl l . @@ -116,14 +118,16 @@ .Nm readlink , error messages are automatically suppressed. .It Fl f Ar format -Display information using the specified format. See the FORMATS section +Display information using the specified format. +See the FORMATS section for a description of valid formats. .It Fl l Display output in .Ic ls Fl lT format. .It Fl r -Display raw information. That is, for all the fields in the stat-structure, +Display raw information. +That is, for all the fields in the stat-structure, display the raw, numerical value (for example, times in seconds since the epoch, etc.) .It Fl s @@ -132,7 +136,8 @@ Display information in a more verbose way as known from some Linux distributions. .It Fl t Ar timefmt -Display timestamps using the specified format. This format is +Display timestamps using the specified format. +This format is passed directly to .Xr strftime 3 . .El @@ -143,7 +148,8 @@ .Cm % , are then followed by a sequence of formatting characters, and end in a character that selects the field of the struct stat which is to be -formatted. If the +formatted. +If the .Cm % is immediately followed by one of .Cm n , @@ -163,7 +169,8 @@ hexadecimal output will have ``0x'' prepended to it. .It Cm + Asserts that a sign indicating whether a number is positive or negative -should always be printed. Non-negative numbers are not usually printed +should always be printed. +Non-negative numbers are not usually printed with a sign. .It Cm - Aligns string output to the left of the field, instead of to the right. @@ -171,7 +178,8 @@ Sets the fill character for left padding to the 0 character, instead of a space. .It space -Reserves a space at the front of non-negative signed output fields. A +Reserves a space at the front of non-negative signed output fields. +A .Sq Cm + overrides a space if both are used. .El @@ -197,7 +205,8 @@ .Cm S . These represent signed decimal output, octal output, unsigned decimal output, hexadecimal output, floating point output, and string output, -respectively. Some output formats do not apply to all fields. +respectively. +Some output formats do not apply to all fields. Floating point output only applies to timespec fields (the .Cm a , .Cm m , @@ -208,7 +217,8 @@ The special output specifier .Cm S may be used to indicate that the output, if -applicable, should be in string format. May be used in combination with +applicable, should be in string format. +May be used in combination with .Bl -tag -width Ds .It Cm amc Display date in strftime(3) format. @@ -228,21 +238,24 @@ Displays the type of .Ar file . .It Cm Y -Insert a `` -\*[Gt] '' into the output. Note that the default output format +Insert a `` -\*[Gt] '' into the output. +Note that the default output format for .Cm Y is a string, but if specified explicitly, these four characters are prepended. .El .It Cm sub -An optional sub field specifier (high, middle, low). Only applies to +An optional sub field specifier (high, middle, low). +Only applies to the .Cm p , .Cm d , .Cm r , and .Cm T -output formats. It can be one of the following: +output formats. +It can be one of the following: .Bl -tag -width Ds .It Cm H ``High'' -- specifies the major number for devices from @@ -299,10 +312,11 @@ owner. .It Cm r Device number for character and block device special files. -.It Cm a , m , c +.It Cm a , m , c , B The time .Ar file -was last accessed, modified, or of when the inode was last changed. +was last accessed or modified, of when the inode was last changed, or +the birth time of the inode. .It Cm z The size of .Ar file @@ -340,8 +354,8 @@ .Pp Only the .Cm % -and the field specifier are required. Most field -specifiers default to +and the field specifier are required. +Most field specifiers default to .Cm U as an output form, with the exception of @@ -371,7 +385,7 @@ lrwxrwxrwx 1 jschauma cs 1 Apr 24 16:37:28 2002 /tmp/foo@ -\*[Gt] / \*[Gt] stat -LF /tmp/foo -lrwxrwxrwx 16 root wheel 512 Apr 19 10:57:54 2002 /tmp/foo/ +drwxr-xr-x 16 root wheel 512 Apr 19 10:57:54 2002 /tmp/foo/ .Ed .Pp To initialize some shell-variables, you could use the @@ -447,8 +461,9 @@ .Sh AUTHORS The .Nm -utility was written by Andrew Brown -.Aq atatat@netbsd.org . -This man page -was written by Jan Schaumann -.Aq jschauma@netbsd.org . +utility was written by +.An Andrew Brown +.Aq atatat@NetBSD.org . +This man page was written by +.An Jan Schaumann +.Aq jschauma@NetBSD.org . ==== //depot/projects/hammer/usr.bin/stat/stat.c#4 (text+ko) ==== @@ -34,14 +34,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> #if 0 #ifndef lint -__RCSID("$NetBSD: stat.c,v 1.9 2002/10/19 20:33:19 provos Exp $"); +__RCSID("$NetBSD: stat.c,v 1.10 2003/05/08 13:05:38 atatat Exp $"); #endif #endif -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/stat/stat.c,v 1.4 2002/10/25 07:26:36 dougb Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/stat/stat.c,v 1.5 2003/05/11 23:02:09 dougb Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -58,14 +58,14 @@ #include <unistd.h> #define DEF_FORMAT \ - "%d %i %Sp %l %Su %Sg %r %z \"%Sa\" \"%Sm\" \"%Sc\" %k %b %N" -#define RAW_FORMAT "%d %i %#p %l %u %g %r %z %a %m %c %k %b %N" + "%d %i %Sp %l %Su %Sg %r %z \"%Sa\" \"%Sm\" \"%Sc\" \"%SB\" %k %b %N" +#define RAW_FORMAT "%d %i %#p %l %u %g %r %z %a %m %c %B %k %b %N" #define LS_FORMAT "%Sp %l %Su %Sg %Z %Sm %N%SY" #define LSF_FORMAT "%Sp %l %Su %Sg %Z %Sm %N%T%SY" #define SHELL_FORMAT \ "st_dev=%d st_ino=%i st_mode=%#p st_nlink=%l " \ "st_uid=%u st_gid=%g st_rdev=%r st_size=%z " \ - "st_atimespec=%a st_mtimespec=%m st_ctimespec=%c " \ + "st_atime=%a st_mtime=%m st_ctime=%c st_birthtime=%B " \ "st_blksize=%k st_blocks=%b" #define LINUX_FORMAT \ " File: \"%N\"%n" \ @@ -129,6 +129,7 @@ #define SHOW_st_atime 'a' #define SHOW_st_mtime 'm' #define SHOW_st_ctime 'c' +#define SHOW_st_btime 'B' #define SHOW_st_size 'z' #define SHOW_st_blocks 'b' #define SHOW_st_blksize 'k' @@ -453,6 +454,7 @@ fmtcase(what, SHOW_st_atime); fmtcase(what, SHOW_st_mtime); fmtcase(what, SHOW_st_ctime); + fmtcase(what, SHOW_st_btime); fmtcase(what, SHOW_st_size); fmtcase(what, SHOW_st_blocks); fmtcase(what, SHOW_st_blksize); @@ -629,6 +631,10 @@ case SHOW_st_ctime: if (tsp == NULL) tsp = &st->st_ctimespec; + /* FALLTHROUGH */ + case SHOW_st_btime: + if (tsp == NULL) + tsp = &st->st_birthtimespec; ts = *tsp; /* copy so we can muck with it */ small = (sizeof(ts.tv_sec) == 4); data = ts.tv_sec;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305120217.h4C2HhFB039760>