sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changing NuttX fixed size type names to C99 standard names -- things will be broken for awhile

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2360 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-12-16 20:30:06 +00:00
parent 9998f85110
commit 757edb2c70
6 changed files with 142 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -997,4 +997,8 @@
int in the architecture; Removed non-standard type STATUS int in the architecture; Removed non-standard type STATUS
* include/ - Added header files stdint.h, stdbool.h, cxx/cstdint, and * include/ - Added header files stdint.h, stdbool.h, cxx/cstdint, and
cxx/cstdbool 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!

96
Documentation/NXGraphicsSubsystem.html
View File

@ -12,7 +12,7 @@
<h1><big><font color="#3c34ec"> <h1><big><font color="#3c34ec">
<i>NX Graphics Subsystem</i> <i>NX Graphics Subsystem</i>
</font></big></h1> </font></big></h1>
<p>Last Updated: December 5, 2008</p> <p>Last Updated: December 16, 2008</p>
</td> </td>
</tr> </tr>
</table> </table>
@ -422,8 +422,8 @@
Holds one device pixel. Holds one device pixel.
NXGLIB will select the smallest size for the <code>nxgl_mxpixel_t</code> 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 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, <code>uint16_t</code> if 24, and 32 resolution
support is disabled, or <code>uint32</code>. support is disabled, or <code>uint32_t</code>.
</p> </p>
<p> <p>
@ -433,7 +433,7 @@
to change: to change:
</p> </p>
<ul><pre> <ul><pre>
typedef sint16 nxgl_coord_t; typedef int16_t nxgl_coord_t;
</pre></ul> </pre></ul>
<p> <p>
@ -501,7 +501,7 @@ struct nxgl_trapezoid_s
<p><b>Function Prototype:</b></p> <p><b>Function Prototype:</b></p>
<ul><pre> <ul><pre>
#include &lt;nuttx/nxglib.h&gt; #include &lt;nuttx/nxglib.h&gt;
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> </pre></ul>
<p> <p>
<b>Description:</b> <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> <p><b>Function Prototype:</b></p>
<ul><pre> <ul><pre>
#include &lt;nuttx/nxglib.h&gt; #include &lt;nuttx/nxglib.h&gt;
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> </pre></ul>
<p> <p>
<b>Description:</b> <b>Description:</b>
@ -617,24 +617,24 @@ nxgl_nonintersecting(FAR struct nxgl_rect_s result[4],
<p><b>Function Prototype:</b></p> <p><b>Function Prototype:</b></p>
<ul><pre> <ul><pre>
#include &lt;nuttx/nxglib.h&gt; #include &lt;nuttx/nxglib.h&gt;
boolean nxgl_rectoverlap(FAR struct nxgl_rect_s *rect1, bool nxgl_rectoverlap(FAR struct nxgl_rect_s *rect1,
FAR struct nxgl_rect_s *rect2); FAR struct nxgl_rect_s *rect2);
</pre></ul> </pre></ul>
<p> <p>
<b>Description:</b> <b>Description:</b>
Return TRUE if the two rectangles overlap. Return true if the two rectangles overlap.
</p> </p>
<h3>2.2.11 <a name="nxglrectinside"><code>nxgl_rectinside()</code></a></h3> <h3>2.2.11 <a name="nxglrectinside"><code>nxgl_rectinside()</code></a></h3>
<p><b>Function Prototype:</b></p> <p><b>Function Prototype:</b></p>
<ul><pre> <ul><pre>
#include &lt;nuttx/nxglib.h&gt; #include &lt;nuttx/nxglib.h&gt;
boolean nxgl_rectinside(FAR const struct nxgl_rect_s *rect, bool nxgl_rectinside(FAR const struct nxgl_rect_s *rect,
FAR const struct nxgl_point_s *pt); FAR const struct nxgl_point_s *pt);
</pre></ul> </pre></ul>
<p> <p>
<b>Description:</b> <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> </p>
<h3>2.2.12 <a name="nxglrectsize"><code>nxgl_rectsize()</code></a></h3> <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> <p><b>Function Prototype:</b></p>
<ul><pre> <ul><pre>
#include &lt;nuttx/nxglib.h&gt; #include &lt;nuttx/nxglib.h&gt;
boolean nxgl_nullrect(FAR const struct nxgl_rect_s *rect); bool nxgl_nullrect(FAR const struct nxgl_rect_s *rect);
</pre></ul> </pre></ul>
<p> <p>
<b>Description:</b> <b>Description:</b>
Return TRUE if the area of the retangle is &lt;= 0. Return true if the area of the retangle is &lt;= 0.
</p> </p>
<h3>2.2.14 <a name="nxglrunoffset"><code>nxgl_runoffset()</code></a></h3> <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 struct nx_callback_s
{ {
void (*redraw)(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, 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, void (*position)(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
FAR const struct nxgl_point_s *pos, FAR const struct nxgl_point_s *pos,
FAR const struct nxgl_rect_s *bounds, FAR const struct nxgl_rect_s *bounds,
FAR void *arg); FAR void *arg);
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_MOUSE
void (*mousein)(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, void (*mousein)(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
ubyte buttons, FAR void *arg); uint8_t buttons, FAR void *arg);
#endif #endif
#ifdef CONFIG_NX_KBD #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 #endif
}; };
</pre></ul> </pre></ul>
@ -796,7 +796,7 @@ struct nx_callback_s
<p><b>Callback Function Prototype:</b></p> <p><b>Callback Function Prototype:</b></p>
<ul><pre> <ul><pre>
void redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, void redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
boolean more, FAR void *arg); bool more, FAR void *arg);
</pre></ul> </pre></ul>
<p> <p>
<b>Description:</b> <b>Description:</b>
@ -812,7 +812,7 @@ void redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
<dt><code>rect</code> <dt><code>rect</code>
<dd>The rectangle that needs to be re-drawn (in window relative coordinates) <dd>The rectangle that needs to be re-drawn (in window relative coordinates)
<dt><code>more</code> <dt><code>more</code>
<dd>TRUE: More re-draw requests will follow <dd>true: More re-draw requests will follow
<dt><code>arg</code> <dt><code>arg</code>
<dd>User provided argument (see <a href="#nxopenwindow"><code>nx_openwindow()</code></a>) <dd>User provided argument (see <a href="#nxopenwindow"><code>nx_openwindow()</code></a>)
</dl></ul> </dl></ul>
@ -860,7 +860,7 @@ void position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
<ul><pre> <ul><pre>
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_MOUSE
void mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, void mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
ubyte buttons, FAR void *arg); uint8_t buttons, FAR void *arg);
#endif #endif
</pre></ul> </pre></ul>
<p> <p>
@ -889,7 +889,7 @@ void mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
<p><b>Callback Function Prototype:</b></p> <p><b>Callback Function Prototype:</b></p>
<ul><pre> <ul><pre>
#ifdef CONFIG_NX_KBD #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 #endif
</pre></ul> </pre></ul>
<p> <p>
@ -1677,8 +1677,8 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest,
#include &lt;nuttx/nx.h&gt; #include &lt;nuttx/nx.h&gt;
#ifdef CONFIG_NX_KBD #ifdef CONFIG_NX_KBD
int nx_kbdchin(NXHANDLE handle, ubyte ch); int nx_kbdchin(NXHANDLE handle, uint8_t ch);
int nx_kbdin(NXHANDLE handle, ubyte nch, FAR const ubyte *ch); int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch);
#endif #endif
</pre></ul> </pre></ul>
<p> <p>
@ -1700,7 +1700,7 @@ int nx_kbdin(NXHANDLE handle, ubyte nch, FAR const ubyte *ch);
#include &lt;nuttx/nx.h&gt; #include &lt;nuttx/nx.h&gt;
#ifdef CONFIG_NX_MOUSE #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 #endif
</pre></ul> </pre></ul>
<p> <p>
@ -2341,12 +2341,12 @@ int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd,
<ul><pre> <ul><pre>
struct nx_fontmetic_s struct nx_fontmetic_s
{ {
uint32 stride : 2; /* Width of one font row in bytes */ uint32_t stride : 2; /* Width of one font row in bytes */
uint32 width : 6; /* Width of the font in bits */ uint32_t width : 6; /* Width of the font in bits */
uint32 height : 6; /* Height of the font in rows */ uint32_t height : 6; /* Height of the font in rows */
uint32 xoffset : 6; /* Top, left-hand corner X-offset in pixels */ uint32_t xoffset : 6; /* Top, left-hand corner X-offset in pixels */
uint32 yoffset : 6; /* Top, left-hand corner y-offset in pixels */ uint32_t yoffset : 6; /* Top, left-hand corner y-offset in pixels */
uint32 unused : 6; uint32_t unused : 6;
}; };
</pre></ul> </pre></ul>
@ -2357,7 +2357,7 @@ struct nx_fontmetic_s
struct nx_fontbitmap_s struct nx_fontbitmap_s
{ {
struct nx_fontmetic_s metric; /* Character metrics */ 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> </pre></ul>
@ -2369,8 +2369,8 @@ struct nx_fontbitmap_s
<ul><pre> <ul><pre>
struct nx_fontset_s struct nx_fontset_s
{ {
ubyte first; /* First bitmap character code */ uint8_t first; /* First bitmap character code */
ubyte nchars; /* Number of bitmap character codes */ uint8_t nchars; /* Number of bitmap character codes */
FAR const struct nx_fontbitmap_s *bitmap; FAR const struct nx_fontbitmap_s *bitmap;
}; };
</pre></ul> </pre></ul>
@ -2381,10 +2381,10 @@ struct nx_fontset_s
<ul><pre> <ul><pre>
struct nx_font_s struct nx_font_s
{ {
ubyte mxheight; /* Max height of one glyph in rows */ uint8_t mxheight; /* Max height of one glyph in rows */
ubyte mxwidth; /* Max width of any glyph in pixels */ uint8_t mxwidth; /* Max width of any glyph in pixels */
ubyte mxbits; /* Max number of bits per character code */ uint8_t mxbits; /* Max number of bits per character code */
ubyte spwidth; /* The width of a space in pixels */ uint8_t spwidth; /* The width of a space in pixels */
}; };
</pre></ul> </pre></ul>
@ -2414,7 +2414,7 @@ FAR const struct nx_font_s *nxf_getfontset(void);
#include &lt;nuttx/nxglib.h&gt; #include &lt;nuttx/nxglib.h&gt;
#include &lt;nuttx/nxfonts.h&gt; #include &lt;nuttx/nxfonts.h&gt;
FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16 ch); FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16_t ch);
</pre></ul> </pre></ul>
<p> <p>
<b>Description:</b> <b>Description:</b>
@ -2438,28 +2438,28 @@ FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16 ch);
#include &lt;nuttx/nxglib.h&gt; #include &lt;nuttx/nxglib.h&gt;
#include &lt;nuttx/nxfonts.h&gt; #include &lt;nuttx/nxfonts.h&gt;
int nxf_convert_2bpp(FAR ubyte *dest, uint16 height, int nxf_convert_2bpp(FAR uint8_t *dest, uint16_t height,
uint16 width, uint16 stride, uint16_t width, uint16_t stride,
FAR const struct nx_fontbitmap_s *bm, FAR const struct nx_fontbitmap_s *bm,
nxgl_mxpixel_t color); nxgl_mxpixel_t color);
int nxf_convert_4bpp(FAR ubyte *dest, uint16 height, int nxf_convert_4bpp(FAR uint8_t *dest, uint16_t height,
uint16 width, uint16 stride, uint16_t width, uint16_t stride,
FAR const struct nx_fontbitmap_s *bm, FAR const struct nx_fontbitmap_s *bm,
nxgl_mxpixel_t color); nxgl_mxpixel_t color);
int nxf_convert_8bpp(FAR ubyte *dest, uint16 height, int nxf_convert_8bpp(FAR uint8_t *dest, uint16_t height,
uint16 width, uint16 stride, uint16_t width, uint16_t stride,
FAR const struct nx_fontbitmap_s *bm, FAR const struct nx_fontbitmap_s *bm,
nxgl_mxpixel_t color); nxgl_mxpixel_t color);
int nxf_convert_16bpp(FAR uint16 *dest, uint16 height, int nxf_convert_16bpp(FAR uint16_t *dest, uint16_t height,
uint16 width, uint16 stride, uint16_t width, uint16_t stride,
FAR const struct nx_fontbitmap_s *bm, FAR const struct nx_fontbitmap_s *bm,
nxgl_mxpixel_t color); nxgl_mxpixel_t color);
int nxf_convert_24bpp(FAR uint32 *dest, uint16 height, int nxf_convert_24bpp(FAR uint32_t *dest, uint16_t height,
uint16 width, uint16 stride, uint16_t width, uint16_t stride,
FAR const struct nx_fontbitmap_s *bm, FAR const struct nx_fontbitmap_s *bm,
nxgl_mxpixel_t color); nxgl_mxpixel_t color);
int nxf_convert_32bpp(FAR uint32 *dest, uint16 height, int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
uint16 width, uint16 stride, uint16_t width, uint16_t stride,
FAR const struct nx_fontbitmap_s *bm, FAR const struct nx_fontbitmap_s *bm,
nxgl_mxpixel_t color); nxgl_mxpixel_t color);
</pre></ul> </pre></ul>

6
Documentation/NuttX.html
View File

@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4"> <tr align="center" bgcolor="#e4e4e4">
<td> <td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1> <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> </td>
</tr> </tr>
</table> </table>
@ -1623,6 +1623,10 @@ nuttx-2010.1 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
int in the architecture; Removed non-standard type STATUS int in the architecture; Removed non-standard type STATUS
* include/ - Added header files stdint.h, stdbool.h, cxx/cstdint, and * include/ - Added header files stdint.h, stdbool.h, cxx/cstdint, and
cxx/cstdbool 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 &lt;spudmonkey@racsa.co.cr&gt; pascal-2010.1 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;

95
Documentation/NuttxPortingGuide.html
View File

@ -12,7 +12,7 @@
<h1><big><font color="#3c34ec"> <h1><big><font color="#3c34ec">
<i>NuttX RTOS Porting Guide</i> <i>NuttX RTOS Porting Guide</i>
</font></big></h1> </font></big></h1>
<p>Last Updated: December 12, 2009</p> <p>Last Updated: December 16, 2009</p>
</td> </td>
</tr> </tr>
</table> </table>
@ -330,14 +330,22 @@
This provides architecture/toolchain-specific definitions for This provides architecture/toolchain-specific definitions for
standard types. This file should <code>typedef</code>: standard types. This file should <code>typedef</code>:
<ul><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> </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> <ul><code>
sint64, uint64 _int24_t, _uint24_t, int64_t, uint64_t
</code></ul> </code></ul>
<p> <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> </p>
<ul><code> <ul><code>
irqstate_t irqstate_t
@ -1239,7 +1247,7 @@ The system can be re-made subsequently by just typing <code>make</code>.
</p> </p>
<h3><a name="upreprioritizertr">4.1.10 <code>up_reprioritize_rtr()</code></a></h3> <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>. <p><b>Description</b>.
Called when the priority of a running or 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> <h3><a name="upassert">4.1.12 <code>up_assert()</code></a></h3>
<p><b>Prototype</b>:<br> <p><b>Prototype</b>:<br>
<code>void up_assert(FAR const ubyte *filename, int linenum);</code></br> <code>void up_assert(FAR const uint8_t *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_code(FAR const uint8_t *filename, int linenum, int error_code);</code></br>
</p> </p>
<p><b>Description</b>. <p><b>Description</b>.
@ -1360,11 +1368,10 @@ The system can be re-made subsequently by just typing <code>make</code>.
</p> </p>
<h3><a name="upinterruptcontext">4.1.15 <code>up_interrupt_context()</code></a></h3> <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>. <p><b>Description</b>.
Return TRUE is we are currently executing in Return true if we are currently executing in the interrupt handler context.
the interrupt handler context.
</p> </p>
<h3><a name="updisableirq">4.1.16 <code>up_disable_irq()</code></a></h3> <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>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>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 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> </ul>
</li> </li>
<li> <li>
@ -1818,12 +1825,12 @@ extern void up_ledoff(int led);
That structure defines a call table with the following methods: That structure defines a call table with the following methods:
<ul> <ul>
<p><code>void lock(FAR struct spi_dev_s *dev);</code></p> <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> <p><code>void select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);</code><br>
<code>uint32 setfrequency(FAR struct spi_dev_s *dev, uint32 frequency);</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 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>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>uint8_t 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>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> <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> <p><code>int registercallback(FAR struct spi_dev_s *dev, mediachange_t callback, void *arg);</code></p>
</ul> </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>. 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: That structure defines a call table with the following methods:
<ul> <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 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 write(FAR struct i2c_dev_s *dev, const uint8_t *buffer, int buflen);</code><br>
<code>int read(FAR struct i2c_dev_s *dev, ubyte *buffer, int buflen);</code></p> <code>int read(FAR struct i2c_dev_s *dev, uint8_t *buffer, int buflen);</code></p>
</ul> </ul>
<li> <li>
<b>Binding I2C Drivers</b>. <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>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 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>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>void rxint(FAR struct uart_dev_s *dev, bool enable);</code><br>
<code>boolean rxavailable(FAR struct uart_dev_s *dev);</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 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>void txint(FAR struct uart_dev_s *dev, bool enable);</code><br>
<code>boolean txready(FAR struct uart_dev_s *dev);</code><br> <code>bool txready(FAR struct uart_dev_s *dev);</code><br>
<code>boolean txempty(FAR struct uart_dev_s *dev);</code></p> <code>bool txempty(FAR struct uart_dev_s *dev);</code></p>
</ul> </ul>
</li> </li>
<li> <li>
@ -1992,8 +1999,8 @@ extern void up_ledoff(int led);
Read/write from the specified read/write blocks: Read/write from the specified read/write blocks:
</p? </p?
<ul> <ul>
<p><code>ssize_t (*bread)(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks, FAR ubyte *buffer);</code><br> <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 ubyte *buffer);</code></p> <code>ssize_t (*bwrite)(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks, FAR const uint8_t *buffer);</code></p>
</ul> </ul>
<p> <p>
Some devices may support byte oriented reads (optional). 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. It is recommended that low-level drivers not support read() if it requires buffering.
</p> </p>
<ul> <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> </ul>
<p> <p>
Support other, less frequently used commands: Support other, less frequently used commands:
@ -2050,8 +2057,8 @@ extern void up_ledoff(int led);
</p> </p>
<ul> <ul>
<p><code>void (*reset)(FAR struct sdio_dev_s *dev);</code><br> <p><code>void (*reset)(FAR struct sdio_dev_s *dev);</code><br>
<code>ubyte (*status)(FAR struct sdio_dev_s *dev);</code><br> <code>uint8_t (*status)(FAR struct sdio_dev_s *dev);</code><br>
<code>void (*widebus)(FAR struct sdio_dev_s *dev, boolean enable);</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>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> <code>int (*attach)(FAR struct sdio_dev_s *dev);</code></p>
</ul> </ul>
@ -2059,25 +2066,25 @@ extern void up_ledoff(int led);
Command/Status/Data Transfer: Command/Status/Data Transfer:
</p? </p?
<ul> <ul>
<p><code>void (*sendcmd)(FAR struct sdio_dev_s *dev, uint32 cmd, uint32 arg);</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 ubyte *buffer, size_t nbytes);</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 ubyte *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 (*cancel)(FAR struct sdio_dev_s *dev);</code><br>
<code>int (*waitresponse)(FAR struct sdio_dev_s *dev, uint32 cmd);</code><br> <code>int (*waitresponse)(FAR struct sdio_dev_s *dev, uint32_t cmd);</code><br>
<code>int (*recvR1)(FAR struct sdio_dev_s *dev, uint32 cmd, uint32 *R1);</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 cmd, uint32 R2[4]);</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 cmd, uint32 *R3);</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 cmd, uint32 *R4);</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 cmd, uint32 *R5);</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 cmd, uint32 *R6);</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 cmd, uint32 *R7);</code></p> <code>int (*recvR7)(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *R7);</code></p>
</ul> </ul>
<p> <p>
Event/Callback support: Event/Callback support:
</p> </p>
<ul> <ul>
<p><code>void (*waitenable)(FAR struct sdio_dev_s *dev, sdio_eventset_t eventset);</code><br> <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>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> <code>int (*registercallback)(FAR struct sdio_dev_s *dev, worker_t callback, void *arg);</code></p>
</ul> </ul>
@ -2085,9 +2092,9 @@ extern void up_ledoff(int led);
DMA support: DMA support:
</p> </p>
<ul> <ul>
<p><code>boolean (*dmasupported)(FAR struct sdio_dev_s *dev);</code><br> <p><code>bool (*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 (*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 ubyte *buffer, size_t buflen);</code></p> <code>int (*dmasendsetup)(FAR struct sdio_dev_s *dev, FAR const uint8_t *buffer, size_t buflen);</code></p>
</ul> </ul>
</li> </li>
<li> <li>

46
Documentation/NuttxUserGuide.html
View File

@ -296,7 +296,7 @@ VxWorks provides the following similar interface:
<b>Function Prototype:</b> <b>Function Prototype:</b>
<pre> <pre>
#include &lt;sched.h&gt; #include &lt;sched.h&gt;
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[]); maint_t entry, const char *argv[]);
</pre> </pre>
@ -346,7 +346,7 @@ mechanism to initialize and start a new task.
<b>POSIX Compatibility:</b> This is a NON-POSIX interface. <b>POSIX Compatibility:</b> This is a NON-POSIX interface.
VxWorks provides the following similar interface: VxWorks provides the following similar interface:
<pre> <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, FUNCPTR entryPt, int arg1, int arg2, int arg3, int arg4, int arg5,
int arg6, int arg7, int arg8, int arg9, int arg10); int arg6, int arg7, int arg8, int arg9, int arg10);
</pre> </pre>
@ -1039,7 +1039,7 @@ VxWorks provides the comparable interface:
<b>Function Prototype:</b> <b>Function Prototype:</b>
<pre> <pre>
#include &lt;sched.h&gt; #include &lt;sched.h&gt;
sint32 sched_lockcount( void ) int32_t sched_lockcount( void )
</pre> </pre>
<p> <p>
@ -2363,8 +2363,8 @@ wd_start() on a given watchdog ID has any effect.
<li><I>wdog</I>. Watchdog ID <li><I>wdog</I>. Watchdog ID
<li><I>delay</I>. Delay count in clock ticks <li><I>delay</I>. Delay count in clock ticks
<li><I>wdentry</I>. Function to call on timeout <li><I>wdentry</I>. Function to call on timeout
<li><I>argc</I>. The number of uint32 parameters to pass to wdentry. <li><I>argc</I>. The number of uint32_t parameters to pass to wdentry.
<li><I>...</I>. uint32 size parameters to pass to wdentry <li><I>...</I>. uint32_t size parameters to pass to wdentry
</ul> </ul>
<p> <p>
@ -6555,16 +6555,16 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt);
<pre> <pre>
struct fat_format_s struct fat_format_s
{ {
ubyte ff_nfats; /* Number of FATs */ uint8_t ff_nfats; /* Number of FATs */
ubyte ff_fattype; /* FAT size: 0 (autoselect), 12, 16, or 32 */ uint8_t ff_fattype; /* FAT size: 0 (autoselect), 12, 16, or 32 */
ubyte ff_clustshift; /* Log2 of sectors per cluster: 0-5, 0xff (autoselect) */ uint8_t ff_clustshift; /* Log2 of sectors per cluster: 0-5, 0xff (autoselect) */
ubyte ff_volumelabel[11]; /* Volume label */ uint8_t ff_volumelabel[11]; /* Volume label */
uint16 ff_backupboot; /* Sector number of the backup boot sector (0=use default)*/ uint16_t ff_backupboot; /* Sector number of the backup boot sector (0=use default)*/
uint16 ff_rootdirentries; /* Number of root directory entries */ uint16_t ff_rootdirentries; /* Number of root directory entries */
uint16 ff_rsvdseccount; /* Reserved sectors */ uint16_t ff_rsvdseccount; /* Reserved sectors */
uint32 ff_hidsec; /* Count of hidden sectors preceding fat */ uint32_t ff_hidsec; /* Count of hidden sectors preceding fat */
uint32 ff_volumeid; /* FAT volume id */ uint32_t ff_volumeid; /* FAT volume id */
uint32 ff_nsectors; /* Number of sectors from device to use: 0: Use all */ uint32_t ff_nsectors; /* Number of sectors from device to use: 0: Use all */
}; };
</pre> </pre>
</ul></li> </ul></li>
@ -7588,25 +7588,25 @@ notify a task when a message is available on a queue.
typedef void (*wdentry_t)(int argc, ...); typedef void (*wdentry_t)(int argc, ...);
</pre> </pre>
<p> <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> </p>
The arguments are passed as uint32 values. The arguments are passed as uint32_t values.
For systems where the sizeof(pointer) &lt; sizeof(uint32), the For systems where the sizeof(pointer) &lt; sizeof(uint32_t), the
following union defines the alignment of the pointer within the following union defines the alignment of the pointer within the
uint32. For example, the SDCC MCS51 general pointer is uint32_t. For example, the SDCC MCS51 general pointer is
24-bits, but uint32 is 32-bits (of course). 24-bits, but uint32_t is 32-bits (of course).
</p> </p>
<pre> <pre>
union wdparm_u union wdparm_u
{ {
void *pvarg; void *pvarg;
uint32 *dwarg; uint32_t *dwarg;
}; };
typedef union wdparm_u wdparm_t; typedef union wdparm_u wdparm_t;
</pre> </pre>
<p> <p>
For most 32-bit systems, pointers and uint32 are the same size For most 32-bit systems, pointers and uint32_t are the same size
For systems where sizeof(pointer) > sizeof(uint32), we will For systems where sizeof(pointer) > sizeof(uint32_t), we will
have to do some redesign. have to do some redesign.
</p> </p>

13
arch/README.txt
View File

@ -79,13 +79,18 @@ include/types.h
This provides architecture/toolchain-specific definitions for This provides architecture/toolchain-specific definitions for
standard types. This file should typedef: standard types. This file should typedef:
sbyte, ubyte, uint8, boolean, sint16, uint16, sint32, uint32 _int8_t, _uint8_t, _int16_t, _uint16_t, _int32_t, _uint32_t
and and if the architecture supports 64-bit integers.
sint64, uint64 _int24_t, _uint24_t, int64_t, uint64_t
if the architecture supports 64-bit integers. 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
irqstate_t irqstate_t