2006-01-08 Joel Sherrill <joel@OARcorp.com>

* libnetworking/rtems/rtems_mii_ioctl.h: Fix formatting.
This commit is contained in:
Joel Sherrill
2006-01-08 18:12:29 +00:00
parent 80d4330a3b
commit 790a300444
2 changed files with 19 additions and 14 deletions
+4
View File
@@ -1,3 +1,7 @@
2006-01-08 Joel Sherrill <joel@OARcorp.com>
* libnetworking/rtems/rtems_mii_ioctl.h: Fix formatting.
2006-01-08 Joel Sherrill <joel@OARcorp.com>
* libcsupport/src/unixlibc.c, libfs/src/imfs/ioman.c: Change
+15 -14
View File
@@ -1,15 +1,15 @@
#ifndef RTEMS_MII_IOCTL_H
#define RTEMS_MII_IOCTL_H
/* $Id$ */
/* Simple (default) implementation for SIOCGIFMEDIA/SIOCSIFMEDIA
* to be used by ethernet drivers [from their ioctl].
*
* NOTE: This much simpler than the BSD ifmedia API
*
* Author: Till Straumann, <strauman@slac.stanford.edu>, 2005
*
* $Id$
*/
/* Author: Till Straumann, <straumanatslacdotstandorddotedu>, 2005 */
#ifndef RTEMS_MII_IOCTL_H
#define RTEMS_MII_IOCTL_H
#include <dev/mii/mii.h> /* MII register definitions */
#include <net/if_media.h> /* media word definitions; rest of API (ifmedia) unused! */
@@ -18,7 +18,8 @@
extern "C" {
#endif
#if defined(_KERNEL) || defined(KERNEL) || defined(__KERNEL) || defined(__KERNEL__)
#if defined(_KERNEL) || defined(KERNEL) || \
defined(__KERNEL) || defined(__KERNEL__)
/* mdio routines to be provided by driver */
/* read mii register 'reg' at 'phy' (-1 meaning any/currently active)
@@ -34,8 +35,7 @@ typedef int (*rtems_mdio_write_func) (int phy, void *uarg, unsigned reg,
uint32_t val);
/* Values to this must be provided by the driver */
struct rtems_mdio_info
{
struct rtems_mdio_info {
rtems_mdio_read_func mdio_r;
rtems_mdio_write_func mdio_w;
unsigned has_gmii:1; /* supports gigabit */
@@ -64,8 +64,8 @@ rtems_mii_ioctl (struct rtems_mdio_info *info, void *uarg, int cmd,
*
* RETURNS: number of characters written to 'buf'
*
* INPUT: if 'bufsz' is set to IFMEDIA2STR_PRINT_TO_FILE, 'buf' can be a FILE pointer
* where the info is printed insted. This can be NULL in which
* INPUT: if 'bufsz' is set to IFMEDIA2STR_PRINT_TO_FILE, 'buf' can be a FILE
* pointer where the info is printed insted. This can be NULL in which
* case 'stdout' is used.
*/
@@ -77,10 +77,11 @@ int rtems_ifmedia2str (int media, char *buf, int bufsz);
* RETURNS: 0 on failure (unrecognized or invalid mode);
* valid results have always at least IFM_ETHER set.
*
* In addition to IFM_SUBTYPE_ETHERNET_DESCRIPTIONS and IFM_SUBTYPE_ETHERNET_ALIASES,
* the strings
* In addition to IFM_SUBTYPE_ETHERNET_DESCRIPTIONS and
* IFM_SUBTYPE_ETHERNET_ALIASES, the strings
*
* '10' [ '0' [ '0' ]] 'b' [ 'ase' ] ( 't' | 'T' ) (* if 100bT [ 'x' | 'X' ] is required here *)
* '10' [ '0' [ '0' ]] 'b' [ 'ase' ] ( 't' | 'T' )
* (* if 100bT [ 'x' | 'X' ] is required here *)
*
* are recognized (e.g., 10bT, 100bTX)
*