From owner-p4-projects@FreeBSD.ORG Mon Jun 19 17:57:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E856216A47C; Mon, 19 Jun 2006 17:57:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEC2E16A479 for ; Mon, 19 Jun 2006 17:57:30 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C91243D45 for ; Mon, 19 Jun 2006 17:57:30 +0000 (GMT) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5JHvUZ8093504 for ; Mon, 19 Jun 2006 17:57:30 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5JHvTe2093501 for perforce@freebsd.org; Mon, 19 Jun 2006 17:57:29 GMT (envelope-from ryanb@FreeBSD.org) Date: Mon, 19 Jun 2006 17:57:29 GMT Message-Id: <200606191757.k5JHvTe2093501@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ryanb@FreeBSD.org using -f From: Ryan Beasley To: Perforce Change Reviews Cc: Subject: PERFORCE change 99630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jun 2006 17:57:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=99630 Change 99630 by ryanb@ryanb_yuki on 2006/06/19 17:57:16 Changed \tag Doxygen references to @tag. Slightly changed new OSS structures to better match style(9); unsure of spacing at the end of oss_audioinfo, but that can wait for now. Affected files ... .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#5 edit .. //depot/projects/soc2006/rbeasley_sound/sys/sys/soundcard.h#5 edit Differences ... ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#5 (text+ko) ==== @@ -1284,36 +1284,36 @@ ai->dev = t_unit; strlcpy(ai->name, device_get_desc(t_dev), sizeof(ai->name)); /** - * @todo \c busy requires examining all channels + * @todo @c busy requires examining all channels * * @note - * \c pid - OSSv4 docs: "Value of -1 means that this information is + * @c pid - OSSv4 docs: "Value of -1 means that this information is * not available or the device is currently not open." Since * multiple processes may open a device, I'm going with the * former. * @par - * \c cmd - Same caveat as \c pid. + * @c cmd - Same caveat as @c pid. */ ai->pid = -1; /** - * @todo \c caps - requires going directly to sound card driver - * @todo \c iformats - same todo as \c caps - * @todo \c oformats - same todo as \c caps + * @todo @c caps - requires going directly to sound card driver + * @todo @c iformats - same todo as @c caps + * @todo @c oformats - same todo as @c caps * * @note - * \c magic - OSSv4 docs: "Reserved for internal use by OSS." + * @c magic - OSSv4 docs: "Reserved for internal use by OSS." * * @par - * \c card_number - OSSv4 docs: "Number of the sound card where this + * @c card_number - OSSv4 docs: "Number of the sound card where this * device belongs or -1 if this information is not available. * Applications should normally not use this field for any * purpose." */ ai->card_number = -1; /** - * @todo \c song_name - depends first on SNDCTL_[GS]ETSONG - * @todo \c label - depends on SNDCTL_[GS]ETLABEL - * @todo \c port_number - device unit number? + * @todo @c song_name - depends first on SNDCTL_[GS]ETSONG + * @todo @c label - depends on SNDCTL_[GS]ETLABEL + * @todo @c port_number - device unit number? */ ai->port_number = -1; ai->mixer_dev = (d->mixer_dev != NULL) ? PCMUNIT(d->mixer_dev) : -1; @@ -1322,19 +1322,19 @@ ai->enabled = device_is_attached(t_dev) ? 1 : 0; /** * @note - * \c flags - OSSv4 docs: "Reserved for future use." + * @c flags - OSSv4 docs: "Reserved for future use." * - * @todo \c min_rate - same todo as \c caps - * @todo \c max_rate - same todo as \c caps - * @todo \c nrates - same todo as \c caps - * @todo \c rates - same todo as \c caps - * @todo \c min_channels - same todo as \c caps - * @todo \c max_channels - same todo as \c caps + * @todo @c min_rate - same todo as @c caps + * @todo @c max_rate - same todo as @c caps + * @todo @c nrates - same todo as @c caps + * @todo @c rates - same todo as @c caps + * @todo @c min_channels - same todo as @c caps + * @todo @c max_channels - same todo as @c caps * * @note - * \c binding - OSSv4 docs: "Reserved for future use." + * @c binding - OSSv4 docs: "Reserved for future use." * - * @todo \c handle - haven't decided how to generate this yet; bus, + * @todo @c handle - haven't decided how to generate this yet; bus, * vendor, device IDs? */ ==== //depot/projects/soc2006/rbeasley_sound/sys/sys/soundcard.h#5 (text+ko) ==== @@ -1479,22 +1479,25 @@ */ typedef struct oss_sysinfo { - char product[32]; /* For example OSS/Free, OSS/Linux or OSS/Solaris */ - char version[32]; /* For example 4.0a */ - int versionnum; /* See OSS_GETVERSION */ - char options[128]; /* Reserved */ + char product[32]; /* For example OSS/Free, OSS/Linux or + OSS/Solaris */ + char version[32]; /* For example 4.0a */ + int versionnum; /* See OSS_GETVERSION */ + char options[128]; /* Reserved */ - int numaudios; /* # of audio/dsp devices */ - int openedaudio[8]; /* Bit mask telling which audio devices are busy */ + int numaudios; /* # of audio/dsp devices */ + int openedaudio[8]; /* Bit mask telling which audio devices + are busy */ - int numsynths; /* # of availavle synth devices */ - int nummidis; /* # of available MIDI ports */ - int numtimers; /* # of available timer devices */ - int nummixers; /* # of mixer devices */ + int numsynths; /* # of availavle synth devices */ + int nummidis; /* # of available MIDI ports */ + int numtimers; /* # of available timer devices */ + int nummixers; /* # of mixer devices */ - int openedmidi[8]; /* Bit mask telling which midi devices are busy */ - int numcards; /* Number of sound cards in the system */ - int filler[241]; /* For future expansion (set to -1) */ + int openedmidi[8]; /* Bit mask telling which midi devices + are busy */ + int numcards; /* Number of sound cards in the system */ + int filler[241]; /* For future expansion (set to -1) */ } oss_sysinfo; #define SNDCTL_SYSINFO _IOR ('X', 1, oss_sysinfo) @@ -1512,32 +1515,39 @@ */ typedef struct oss_audioinfo { - int dev; /* Audio device number */ - char name[64]; - int busy; /* 0, OPEN_READ, OPEN_WRITE or OPEN_READWRITE */ - int pid; - int caps; /* DSP_CAP_INPUT, DSP_CAP_OUTPUT */ - int iformats, oformats; - int magic; /* Reserved for internal use */ - char cmd[64]; /* Command using the device (if known) */ - int card_number; - int port_number; - int mixer_dev; - int real_device; /* Obsolete field. Replaced by devnode */ - int enabled; /* 1=enabled, 0=device not ready at this moment */ - int flags; /* For internal use only - no practical meaning */ - int min_rate, max_rate; /* Sample rate limits */ - int min_channels, max_channels; /* Number of channels supported */ - int binding; /* DSP_BIND_FRONT, etc. 0 means undefined */ - int rate_source; - char handle[32]; - #define MAX_SAMPLE_RATES 20 /* Cannot be changed */ - unsigned int nrates, rates[MAX_SAMPLE_RATES]; /* Please read the manual before using these */ - oss_longname_t song_name; /* Song name (if given) */ - oss_label_t label; /* Device label (if given) */ - int latency; /* In usecs, -1=unknown */ - oss_devnode_t devnode; /* Device special file name (inside /dev) */ - int filler[186]; + int dev; /* Audio device number */ + char name[64]; + int busy; /* 0, OPEN_READ, OPEN_WRITE or OPEN_READWRITE */ + int pid; + int caps; /* DSP_CAP_INPUT, DSP_CAP_OUTPUT */ + int iformats; + int oformats; + int magic; /* Reserved for internal use */ + char cmd[64]; /* Command using the device (if known) */ + int card_number; + int port_number; + int mixer_dev; + int real_device; /* Obsolete field. Replaced by devnode */ + int enabled; /* 1=enabled, 0=device not ready at this + moment */ + int flags; /* For internal use only - no practical + meaning */ + int min_rate; /* Sample rate limits */ + int max_rate; + int min_channels; /* Number of channels supported */ + int max_channels; + int binding; /* DSP_BIND_FRONT, etc. 0 means undefined */ + int rate_source; + char handle[32]; + #define MAX_SAMPLE_RATES 20 /* Cannot be changed */ + unsigned int nrates; + unsigned int rates[MAX_SAMPLE_RATES]; /* Please read the manual before using these */ + oss_longname_t song_name; /* Song name (if given) */ + oss_label_t label; /* Device label (if given) */ + int latency; /* In usecs, -1=unknown */ + oss_devnode_t devnode; /* Device special file name (inside + /dev) */ + int filler[186]; } oss_audioinfo; #define SNDCTL_AUDIOINFO _IOWR('X', 7, oss_audioinfo)