diff options
Diffstat (limited to 'nuttx/Documentation')
-rw-r--r-- | nuttx/Documentation/NXGraphicsSubsystem.html | 100 | ||||
-rw-r--r-- | nuttx/Documentation/NuttX.html | 6 | ||||
-rw-r--r-- | nuttx/Documentation/NuttxPortingGuide.html | 95 | ||||
-rw-r--r-- | nuttx/Documentation/NuttxUserGuide.html | 46 |
4 files changed, 129 insertions, 118 deletions
diff --git a/nuttx/Documentation/NXGraphicsSubsystem.html b/nuttx/Documentation/NXGraphicsSubsystem.html index 6d4597acf..22aa5f962 100644 --- a/nuttx/Documentation/NXGraphicsSubsystem.html +++ b/nuttx/Documentation/NXGraphicsSubsystem.html @@ -12,7 +12,7 @@ <h1><big><font color="#3c34ec"> <i>NX Graphics Subsystem</i> </font></big></h1> - <p>Last Updated: December 5, 2008</p> + <p>Last Updated: December 16, 2008</p> </td> </tr> </table> @@ -422,8 +422,8 @@ Holds one device pixel. NXGLIB will select the smallest size for the <code>nxgl_mxpixel_t</code> that just contains the pixel: <code>byte</code> if 16, 24, and 32 resolution - support is disabled, <code>uint16</code> if 24, and 32 resolution - support is disabled, or <code>uint32</code>. + support is disabled, <code>uint16_t</code> if 24, and 32 resolution + support is disabled, or <code>uint32_t</code>. </p> <p> @@ -433,7 +433,7 @@ to change: </p> <ul><pre> -typedef sint16 nxgl_coord_t; +typedef int16_t nxgl_coord_t; </pre></ul> <p> @@ -501,7 +501,7 @@ struct nxgl_trapezoid_s <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nxglib.h> -void nxgl_rgb2yuv(ubyte r, ubyte g, ubyte b, ubyte *y, ubyte *u, ubyte *v); +void nxgl_rgb2yuv(uint8_t r, uint8_t g, uint8_t b, uint8_t *y, uint8_t *u, uint8_t *v); </pre></ul> <p> <b>Description:</b> @@ -512,7 +512,7 @@ void nxgl_rgb2yuv(ubyte r, ubyte g, ubyte b, ubyte *y, ubyte *u, ubyte *v); <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nxglib.h> -void nxgl_yuv2rgb(ubyte y, ubyte u, ubyte v, ubyte *r, ubyte *g, ubyte *b); +void nxgl_yuv2rgb(uint8_t y, uint8_t u, uint8_t v, uint8_t *r, uint8_t *g, uint8_t *b); </pre></ul> <p> <b>Description:</b> @@ -617,24 +617,24 @@ nxgl_nonintersecting(FAR struct nxgl_rect_s result[4], <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nxglib.h> -boolean nxgl_rectoverlap(FAR struct nxgl_rect_s *rect1, - FAR struct nxgl_rect_s *rect2); +bool nxgl_rectoverlap(FAR struct nxgl_rect_s *rect1, + FAR struct nxgl_rect_s *rect2); </pre></ul> <p> <b>Description:</b> - Return TRUE if the two rectangles overlap. + Return true if the two rectangles overlap. </p> <h3>2.2.11 <a name="nxglrectinside"><code>nxgl_rectinside()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nxglib.h> -boolean nxgl_rectinside(FAR const struct nxgl_rect_s *rect, - FAR const struct nxgl_point_s *pt); +bool nxgl_rectinside(FAR const struct nxgl_rect_s *rect, + FAR const struct nxgl_point_s *pt); </pre></ul> <p> <b>Description:</b> - Return TRUE if the point <code>pt</code> lies within <code>rect</code>. + Return true if the point <code>pt</code> lies within <code>rect</code>. </p> <h3>2.2.12 <a name="nxglrectsize"><code>nxgl_rectsize()</code></a></h3> @@ -653,11 +653,11 @@ void nxgl_rectsize(FAR struct nxgl_size_s *size, <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nxglib.h> -boolean nxgl_nullrect(FAR const struct nxgl_rect_s *rect); +bool nxgl_nullrect(FAR const struct nxgl_rect_s *rect); </pre></ul> <p> <b>Description:</b> - Return TRUE if the area of the retangle is <= 0. + Return true if the area of the retangle is <= 0. </p> <h3>2.2.14 <a name="nxglrunoffset"><code>nxgl_runoffset()</code></a></h3> @@ -775,17 +775,17 @@ typedef FAR void *NXWINDOW; struct nx_callback_s { void (*redraw)(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, - boolean more, FAR void *arg); + bool more, FAR void *arg); void (*position)(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); #ifdef CONFIG_NX_MOUSE void (*mousein)(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, - ubyte buttons, FAR void *arg); + uint8_t buttons, FAR void *arg); #endif #ifdef CONFIG_NX_KBD - void (*kbdin)(NXWINDOW hwnd, ubyte nch, FAR const ubyte *ch, FAR void *arg); + void (*kbdin)(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch, FAR void *arg); #endif }; </pre></ul> @@ -796,7 +796,7 @@ struct nx_callback_s <p><b>Callback Function Prototype:</b></p> <ul><pre> void redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, - boolean more, FAR void *arg); + bool more, FAR void *arg); </pre></ul> <p> <b>Description:</b> @@ -812,7 +812,7 @@ void redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, <dt><code>rect</code> <dd>The rectangle that needs to be re-drawn (in window relative coordinates) <dt><code>more</code> - <dd>TRUE: More re-draw requests will follow + <dd>true: More re-draw requests will follow <dt><code>arg</code> <dd>User provided argument (see <a href="#nxopenwindow"><code>nx_openwindow()</code></a>) </dl></ul> @@ -860,7 +860,7 @@ void position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, <ul><pre> #ifdef CONFIG_NX_MOUSE void mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, - ubyte buttons, FAR void *arg); + uint8_t buttons, FAR void *arg); #endif </pre></ul> <p> @@ -889,7 +889,7 @@ void mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, <p><b>Callback Function Prototype:</b></p> <ul><pre> #ifdef CONFIG_NX_KBD -void (*kbdin)(NXWINDOW hwnd, ubyte nch, FAR const ubyte *ch, FAR void *arg); +void (*kbdin)(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch, FAR void *arg); #endif </pre></ul> <p> @@ -1677,8 +1677,8 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest, #include <nuttx/nx.h> #ifdef CONFIG_NX_KBD -int nx_kbdchin(NXHANDLE handle, ubyte ch); -int nx_kbdin(NXHANDLE handle, ubyte nch, FAR const ubyte *ch); +int nx_kbdchin(NXHANDLE handle, uint8_t ch); +int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch); #endif </pre></ul> <p> @@ -1700,7 +1700,7 @@ int nx_kbdin(NXHANDLE handle, ubyte nch, FAR const ubyte *ch); #include <nuttx/nx.h> #ifdef CONFIG_NX_MOUSE -int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, ubyte buttons); +int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons); #endif </pre></ul> <p> @@ -2341,12 +2341,12 @@ int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd, <ul><pre> struct nx_fontmetic_s { - uint32 stride : 2; /* Width of one font row in bytes */ - uint32 width : 6; /* Width of the font in bits */ - uint32 height : 6; /* Height of the font in rows */ - uint32 xoffset : 6; /* Top, left-hand corner X-offset in pixels */ - uint32 yoffset : 6; /* Top, left-hand corner y-offset in pixels */ - uint32 unused : 6; + uint32_t stride : 2; /* Width of one font row in bytes */ + uint32_t width : 6; /* Width of the font in bits */ + uint32_t height : 6; /* Height of the font in rows */ + uint32_t xoffset : 6; /* Top, left-hand corner X-offset in pixels */ + uint32_t yoffset : 6; /* Top, left-hand corner y-offset in pixels */ + uint32_t unused : 6; }; </pre></ul> @@ -2357,7 +2357,7 @@ struct nx_fontmetic_s struct nx_fontbitmap_s { struct nx_fontmetic_s metric; /* Character metrics */ - FAR const ubyte *bitmap; /* Pointer to the character bitmap */ + FAR const uint8_t *bitmap; /* Pointer to the character bitmap */ }; </pre></ul> @@ -2369,8 +2369,8 @@ struct nx_fontbitmap_s <ul><pre> struct nx_fontset_s { - ubyte first; /* First bitmap character code */ - ubyte nchars; /* Number of bitmap character codes */ + uint8_t first; /* First bitmap character code */ + uint8_t nchars; /* Number of bitmap character codes */ FAR const struct nx_fontbitmap_s *bitmap; }; </pre></ul> @@ -2381,10 +2381,10 @@ struct nx_fontset_s <ul><pre> struct nx_font_s { - ubyte mxheight; /* Max height of one glyph in rows */ - ubyte mxwidth; /* Max width of any glyph in pixels */ - ubyte mxbits; /* Max number of bits per character code */ - ubyte spwidth; /* The width of a space in pixels */ + uint8_t mxheight; /* Max height of one glyph in rows */ + uint8_t mxwidth; /* Max width of any glyph in pixels */ + uint8_t mxbits; /* Max number of bits per character code */ + uint8_t spwidth; /* The width of a space in pixels */ }; </pre></ul> @@ -2414,7 +2414,7 @@ FAR const struct nx_font_s *nxf_getfontset(void); #include <nuttx/nxglib.h> #include <nuttx/nxfonts.h> -FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16 ch); +FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16_t ch); </pre></ul> <p> <b>Description:</b> @@ -2438,28 +2438,28 @@ FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16 ch); #include <nuttx/nxglib.h> #include <nuttx/nxfonts.h> -int nxf_convert_2bpp(FAR ubyte *dest, uint16 height, - uint16 width, uint16 stride, +int nxf_convert_2bpp(FAR uint8_t *dest, uint16_t height, + uint16_t width, uint16_t stride, FAR const struct nx_fontbitmap_s *bm, nxgl_mxpixel_t color); -int nxf_convert_4bpp(FAR ubyte *dest, uint16 height, - uint16 width, uint16 stride, +int nxf_convert_4bpp(FAR uint8_t *dest, uint16_t height, + uint16_t width, uint16_t stride, FAR const struct nx_fontbitmap_s *bm, nxgl_mxpixel_t color); -int nxf_convert_8bpp(FAR ubyte *dest, uint16 height, - uint16 width, uint16 stride, +int nxf_convert_8bpp(FAR uint8_t *dest, uint16_t height, + uint16_t width, uint16_t stride, FAR const struct nx_fontbitmap_s *bm, nxgl_mxpixel_t color); -int nxf_convert_16bpp(FAR uint16 *dest, uint16 height, - uint16 width, uint16 stride, +int nxf_convert_16bpp(FAR uint16_t *dest, uint16_t height, + uint16_t width, uint16_t stride, FAR const struct nx_fontbitmap_s *bm, nxgl_mxpixel_t color); -int nxf_convert_24bpp(FAR uint32 *dest, uint16 height, - uint16 width, uint16 stride, +int nxf_convert_24bpp(FAR uint32_t *dest, uint16_t height, + uint16_t width, uint16_t stride, FAR const struct nx_fontbitmap_s *bm, nxgl_mxpixel_t color); -int nxf_convert_32bpp(FAR uint32 *dest, uint16 height, - uint16 width, uint16 stride, +int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, + uint16_t width, uint16_t stride, FAR const struct nx_fontbitmap_s *bm, nxgl_mxpixel_t color); </pre></ul> diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 677454514..f655d0da0 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -8,7 +8,7 @@ <tr align="center" bgcolor="#e4e4e4"> <td> <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1> - <p>Last Updated: December 13, 2009</p> + <p>Last Updated: December 16, 2009</p> </td> </tr> </table> @@ -1623,6 +1623,10 @@ nuttx-2010.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> int in the architecture; Removed non-standard type STATUS * include/ - Added header files stdint.h, stdbool.h, cxx/cstdint, and cxx/cstdbool + * Changed ALL references to non-standard fixed-size types (like uint32, + ubyte, etc.) to standard types (like uint32_t, uint8_t, etc.) from + stdint.h. Use type bool and {true, false} from stdbool. This effected + most of the files in the system! pascal-2010.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index a7880d8f8..6770709ef 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -12,7 +12,7 @@ <h1><big><font color="#3c34ec"> <i>NuttX RTOS Porting Guide</i> </font></big></h1> - <p>Last Updated: December 12, 2009</p> + <p>Last Updated: December 16, 2009</p> </td> </tr> </table> @@ -330,14 +330,22 @@ This provides architecture/toolchain-specific definitions for standard types. This file should <code>typedef</code>: <ul><code> - sbyte, ubyte, uint8, boolean, sint16, uint16, sint32, uint32 + _int8_t, _uint8_t, _int16_t, _uint16_t, _int32_t, _uint32_t_t </code></ul> - <p>and if the architecture supports 64-bit integers</p> + <p>and if the architecture supports 24- or 64-bit integers</p> <ul><code> - sint64, uint64 + _int24_t, _uint24_t, int64_t, uint64_t </code></ul> <p> - and finally + NOTE that these type names have a leading underscore character. This + file will be included(indirectly) by include/stdint.h and typedef'ed to + the final name without the underscore character. This roundabout way of + doings things allows the stdint.h to be removed from the include/ + directory in the event that the user prefers to use the definitions + provided by their toolchain header files + </p> + <p> + And finally </p> <ul><code> irqstate_t @@ -1239,7 +1247,7 @@ The system can be re-made subsequently by just typing <code>make</code>. </p> <h3><a name="upreprioritizertr">4.1.10 <code>up_reprioritize_rtr()</code></a></h3> -<p><b>Prototype</b>: <code>void up_reprioritize_rtr(FAR _TCB *tcb, ubyte priority);</code></p> +<p><b>Prototype</b>: <code>void up_reprioritize_rtr(FAR _TCB *tcb, uint8_t priority);</code></p> <p><b>Description</b>. Called when the priority of a running or @@ -1289,8 +1297,8 @@ The system can be re-made subsequently by just typing <code>make</code>. <h3><a name="upassert">4.1.12 <code>up_assert()</code></a></h3> <p><b>Prototype</b>:<br> - <code>void up_assert(FAR const ubyte *filename, int linenum);</code></br> - <code>void up_assert_code(FAR const ubyte *filename, int linenum, int error_code);</code></br> + <code>void up_assert(FAR const uint8_t *filename, int linenum);</code></br> + <code>void up_assert_code(FAR const uint8_t *filename, int linenum, int error_code);</code></br> </p> <p><b>Description</b>. @@ -1360,11 +1368,10 @@ The system can be re-made subsequently by just typing <code>make</code>. </p> <h3><a name="upinterruptcontext">4.1.15 <code>up_interrupt_context()</code></a></h3> -<p><b>Prototype</b>: <code>boolean up_interrupt_context(void)</code></p> +<p><b>Prototype</b>: <code>bool up_interrupt_context(void)</code></p> <p><b>Description</b>. - Return TRUE is we are currently executing in - the interrupt handler context. + Return true if we are currently executing in the interrupt handler context. </p> <h3><a name="updisableirq">4.1.16 <code>up_disable_irq()</code></a></h3> @@ -1710,7 +1717,7 @@ extern void up_ledoff(int led); <code>ssize_t write(FAR struct file *filp, FAR const char *buffer, size_t buflen);</code><br> <code>off_t seek(FAR struct file *filp, off_t offset, int whence);</code><br> <code>int ioctl(FAR struct file *filp, int cmd, unsigned long arg);</code><br> - <code>int poll(FAR struct file *filp, struct pollfd *fds, boolean setup);</code></p> + <code>int poll(FAR struct file *filp, struct pollfd *fds, bool setup);</code></p> </ul> </li> <li> @@ -1818,12 +1825,12 @@ extern void up_ledoff(int led); That structure defines a call table with the following methods: <ul> <p><code>void lock(FAR struct spi_dev_s *dev);</code></p> - <p><code>void select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected);</code><br> - <code>uint32 setfrequency(FAR struct spi_dev_s *dev, uint32 frequency);</code><br> + <p><code>void select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);</code><br> + <code>uint32_t setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency);</code><br> <code>void setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode);</code><br> <code>void setbits(FAR struct spi_dev_s *dev, int nbits);</code><br> - <code>ubyte status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);</code><br> - <code>uint16 send(FAR struct spi_dev_s *dev, uint16 wd);</code><br> + <code>uint8_t status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);</code><br> + <code>uint16_t send(FAR struct spi_dev_s *dev, uint16_t wd);</code><br> <code>void exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, FAR void *rxbuffer, size_t nwords);</code><br> <p><code>int registercallback(FAR struct spi_dev_s *dev, mediachange_t callback, void *arg);</code></p> </ul> @@ -1856,10 +1863,10 @@ extern void up_ledoff(int led); Each I2C device driver must implement an instance of <code>struct i2c_ops_s</code>. That structure defines a call table with the following methods: <ul> - <p><code>uint32 setfrequency(FAR struct i2c_dev_s *dev, uint32 frequency);</code><br> + <p><code>uint32_t setfrequency(FAR struct i2c_dev_s *dev, uint32_t frequency);</code><br> <code>int setaddress(FAR struct i2c_dev_s *dev, int addr, int nbits);</code><br> - <code>int write(FAR struct i2c_dev_s *dev, const ubyte *buffer, int buflen);</code><br> - <code>int read(FAR struct i2c_dev_s *dev, ubyte *buffer, int buflen);</code></p> + <code>int write(FAR struct i2c_dev_s *dev, const uint8_t *buffer, int buflen);</code><br> + <code>int read(FAR struct i2c_dev_s *dev, uint8_t *buffer, int buflen);</code></p> </ul> <li> <b>Binding I2C Drivers</b>. @@ -1895,12 +1902,12 @@ extern void up_ledoff(int led); <code>void detach(FAR struct uart_dev_s *dev);</code><br> <code>int ioctl(FAR struct file *filep, int cmd, unsigned long arg);</code><br> <code>int receive(FAR struct uart_dev_s *dev, unsigned int *status);</code><br> - <code>void rxint(FAR struct uart_dev_s *dev, boolean enable);</code><br> - <code>boolean rxavailable(FAR struct uart_dev_s *dev);</code><br> + <code>void rxint(FAR struct uart_dev_s *dev, bool enable);</code><br> + <code>bool rxavailable(FAR struct uart_dev_s *dev);</code><br> <code>void send(FAR struct uart_dev_s *dev, int ch);</code><br> - <code>void txint(FAR struct uart_dev_s *dev, boolean enable);</code><br> - <code>boolean txready(FAR struct uart_dev_s *dev);</code><br> - <code>boolean txempty(FAR struct uart_dev_s *dev);</code></p> + <code>void txint(FAR struct uart_dev_s *dev, bool enable);</code><br> + <code>bool txready(FAR struct uart_dev_s *dev);</code><br> + <code>bool txempty(FAR struct uart_dev_s *dev);</code></p> </ul> </li> <li> @@ -1992,8 +1999,8 @@ extern void up_ledoff(int led); Read/write from the specified read/write blocks: </p? <ul> - <p><code>ssize_t (*bread)(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks, FAR ubyte *buffer);</code><br> - <code>ssize_t (*bwrite)(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks, FAR const ubyte *buffer);</code></p> + <p><code>ssize_t (*bread)(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks, FAR uint8_t *buffer);</code><br> + <code>ssize_t (*bwrite)(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks, FAR const uint8_t *buffer);</code></p> </ul> <p> Some devices may support byte oriented reads (optional). @@ -2001,7 +2008,7 @@ extern void up_ledoff(int led); It is recommended that low-level drivers not support read() if it requires buffering. </p> <ul> - <p><code>ssize_t (*read)(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes, FAR ubyte *buffer);</code></p> + <p><code>ssize_t (*read)(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes, FAR uint8_t *buffer);</code></p> </ul> <p> Support other, less frequently used commands: @@ -2050,8 +2057,8 @@ extern void up_ledoff(int led); </p> <ul> <p><code>void (*reset)(FAR struct sdio_dev_s *dev);</code><br> - <code>ubyte (*status)(FAR struct sdio_dev_s *dev);</code><br> - <code>void (*widebus)(FAR struct sdio_dev_s *dev, boolean enable);</code><br> + <code>uint8_t (*status)(FAR struct sdio_dev_s *dev);</code><br> + <code>void (*widebus)(FAR struct sdio_dev_s *dev, bool enable);</code><br> <code>void (*clock)(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate);</code><br> <code>int (*attach)(FAR struct sdio_dev_s *dev);</code></p> </ul> @@ -2059,25 +2066,25 @@ extern void up_ledoff(int led); Command/Status/Data Transfer: </p? <ul> - <p><code>void (*sendcmd)(FAR struct sdio_dev_s *dev, uint32 cmd, uint32 arg);</code><br> - <code>int (*recvsetup)(FAR struct sdio_dev_s *dev, FAR ubyte *buffer, size_t nbytes);</code><br> - <code>int (*sendsetup)(FAR struct sdio_dev_s *dev, FAR const ubyte *buffer, size_t nbytes);</code><br> + <p><code>void (*sendcmd)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg);</code><br> + <code>int (*recvsetup)(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, size_t nbytes);</code><br> + <code>int (*sendsetup)(FAR struct sdio_dev_s *dev, FAR const uint8_t *buffer, size_t nbytes);</code><br> <code>int (*cancel)(FAR struct sdio_dev_s *dev);</code><br> - <code>int (*waitresponse)(FAR struct sdio_dev_s *dev, uint32 cmd);</code><br> - <code>int (*recvR1)(FAR struct sdio_dev_s *dev, uint32 cmd, uint32 *R1);</code><br> - <code>int (*recvR2)(FAR struct sdio_dev_s *dev, uint32 cmd, uint32 R2[4]);</code><br> - <code>int (*recvR3)(FAR struct sdio_dev_s *dev, uint32 cmd, uint32 *R3);</code><br> - <code>int (*recvR4)(FAR struct sdio_dev_s *dev, uint32 cmd, uint32 *R4);</code><br> - <code>int (*recvR5)(FAR struct sdio_dev_s *dev, uint32 cmd, uint32 *R5);</code><br> - <code>int (*recvR6)(FAR struct sdio_dev_s *dev, uint32 cmd, uint32 *R6);</code><br> - <code>int (*recvR7)(FAR struct sdio_dev_s *dev, uint32 cmd, uint32 *R7);</code></p> + <code>int (*waitresponse)(FAR struct sdio_dev_s *dev, uint32_t cmd);</code><br> + <code>int (*recvR1)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R1);</code><br> + <code>int (*recvR2)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t R2[4]);</code><br> + <code>int (*recvR3)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R3);</code><br> + <code>int (*recvR4)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R4);</code><br> + <code>int (*recvR5)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R5);</code><br> + <code>int (*recvR6)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R6);</code><br> + <code>int (*recvR7)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R7);</code></p> </ul> <p> Event/Callback support: </p> <ul> <p><code>void (*waitenable)(FAR struct sdio_dev_s *dev, sdio_eventset_t eventset);</code><br> - <code>sdio_eventset_t (*eventwait)(FAR struct sdio_dev_s *dev, uint32 timeout);</code><br> + <code>sdio_eventset_t (*eventwait)(FAR struct sdio_dev_s *dev, uint32_t timeout);</code><br> <code>void (*callbackenable)(FAR struct sdio_dev_s *dev, sdio_eventset_t eventset);</code><br> <code>int (*registercallback)(FAR struct sdio_dev_s *dev, worker_t callback, void *arg);</code></p> </ul> @@ -2085,9 +2092,9 @@ extern void up_ledoff(int led); DMA support: </p> <ul> - <p><code>boolean (*dmasupported)(FAR struct sdio_dev_s *dev);</code><br> - <code>int (*dmarecvsetup)(FAR struct sdio_dev_s *dev, FAR ubyte *buffer, size_t buflen);</code><br> - <code>int (*dmasendsetup)(FAR struct sdio_dev_s *dev, FAR const ubyte *buffer, size_t buflen);</code></p> + <p><code>bool (*dmasupported)(FAR struct sdio_dev_s *dev);</code><br> + <code>int (*dmarecvsetup)(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, size_t buflen);</code><br> + <code>int (*dmasendsetup)(FAR struct sdio_dev_s *dev, FAR const uint8_t *buffer, size_t buflen);</code></p> </ul> </li> <li> diff --git a/nuttx/Documentation/NuttxUserGuide.html b/nuttx/Documentation/NuttxUserGuide.html index 5d477c8cf..024e0392d 100644 --- a/nuttx/Documentation/NuttxUserGuide.html +++ b/nuttx/Documentation/NuttxUserGuide.html @@ -296,7 +296,7 @@ VxWorks provides the following similar interface: <b>Function Prototype:</b> <pre> #include <sched.h> - int task_init(_TCB *tcb, char *name, int priority, uint32 *stack, uint32 stack_size, + int task_init(_TCB *tcb, char *name, int priority, uint32_t *stack, uint32_t stack_size, maint_t entry, const char *argv[]); </pre> @@ -346,7 +346,7 @@ mechanism to initialize and start a new task. <b>POSIX Compatibility:</b> This is a NON-POSIX interface. VxWorks provides the following similar interface: <pre> - STATUS taskInit(WIND_TCB *pTcb, char *name, int priority, int options, uint32 *pStackBase, int stackSize, + STATUS taskInit(WIND_TCB *pTcb, char *name, int priority, int options, uint32_t *pStackBase, int stackSize, FUNCPTR entryPt, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10); </pre> @@ -1039,7 +1039,7 @@ VxWorks provides the comparable interface: <b>Function Prototype:</b> <pre> #include <sched.h> - sint32 sched_lockcount( void ) + int32_t sched_lockcount( void ) </pre> <p> @@ -2363,8 +2363,8 @@ wd_start() on a given watchdog ID has any effect. <li><I>wdog</I>. Watchdog ID <li><I>delay</I>. Delay count in clock ticks <li><I>wdentry</I>. Function to call on timeout -<li><I>argc</I>. The number of uint32 parameters to pass to wdentry. -<li><I>...</I>. uint32 size parameters to pass to wdentry +<li><I>argc</I>. The number of uint32_t parameters to pass to wdentry. +<li><I>...</I>. uint32_t size parameters to pass to wdentry </ul> <p> @@ -6555,16 +6555,16 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt); <pre> struct fat_format_s { - ubyte ff_nfats; /* Number of FATs */ - ubyte ff_fattype; /* FAT size: 0 (autoselect), 12, 16, or 32 */ - ubyte ff_clustshift; /* Log2 of sectors per cluster: 0-5, 0xff (autoselect) */ - ubyte ff_volumelabel[11]; /* Volume label */ - uint16 ff_backupboot; /* Sector number of the backup boot sector (0=use default)*/ - uint16 ff_rootdirentries; /* Number of root directory entries */ - uint16 ff_rsvdseccount; /* Reserved sectors */ - uint32 ff_hidsec; /* Count of hidden sectors preceding fat */ - uint32 ff_volumeid; /* FAT volume id */ - uint32 ff_nsectors; /* Number of sectors from device to use: 0: Use all */ + uint8_t ff_nfats; /* Number of FATs */ + uint8_t ff_fattype; /* FAT size: 0 (autoselect), 12, 16, or 32 */ + uint8_t ff_clustshift; /* Log2 of sectors per cluster: 0-5, 0xff (autoselect) */ + uint8_t ff_volumelabel[11]; /* Volume label */ + uint16_t ff_backupboot; /* Sector number of the backup boot sector (0=use default)*/ + uint16_t ff_rootdirentries; /* Number of root directory entries */ + uint16_t ff_rsvdseccount; /* Reserved sectors */ + uint32_t ff_hidsec; /* Count of hidden sectors preceding fat */ + uint32_t ff_volumeid; /* FAT volume id */ + uint32_t ff_nsectors; /* Number of sectors from device to use: 0: Use all */ }; </pre> </ul></li> @@ -7588,25 +7588,25 @@ notify a task when a message is available on a queue. typedef void (*wdentry_t)(int argc, ...); </pre> <p> - Where argc is the number of uint32 type arguments that follow. + Where argc is the number of uint32_t type arguments that follow. </p> - The arguments are passed as uint32 values. - For systems where the sizeof(pointer) < sizeof(uint32), the + The arguments are passed as uint32_t values. + For systems where the sizeof(pointer) < sizeof(uint32_t), the following union defines the alignment of the pointer within the - uint32. For example, the SDCC MCS51 general pointer is - 24-bits, but uint32 is 32-bits (of course). + uint32_t. For example, the SDCC MCS51 general pointer is + 24-bits, but uint32_t is 32-bits (of course). </p> <pre> union wdparm_u { void *pvarg; - uint32 *dwarg; + uint32_t *dwarg; }; typedef union wdparm_u wdparm_t; </pre> <p> - For most 32-bit systems, pointers and uint32 are the same size - For systems where sizeof(pointer) > sizeof(uint32), we will + For most 32-bit systems, pointers and uint32_t are the same size + For systems where sizeof(pointer) > sizeof(uint32_t), we will have to do some redesign. </p> |