mirror of
https://github.com/apache/nuttx.git
synced 2026-05-30 21:36:28 +08:00
Fixes for clean NX compile/link
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2374 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
@@ -1000,5 +1000,10 @@
|
|||||||
* Changed ALL references to non-standard fixed-size types (like uint32,
|
* Changed ALL references to non-standard fixed-size types (like uint32,
|
||||||
ubyte, etc.) to standard types (like uint32_t, uint8_t, etc.) from
|
ubyte, etc.) to standard types (like uint32_t, uint8_t, etc.) from
|
||||||
stdint.h. Use type bool and {true, false} from stdbool. This effected
|
stdint.h. Use type bool and {true, false} from stdbool. This effected
|
||||||
most of the files in the system!
|
most of the files in the system! Almost all configurations have been
|
||||||
|
re-built and many have been re-verified in order to get confidence in
|
||||||
|
these changes.
|
||||||
|
* graphics/ and examples/nx - Fix numerous build errors that have been
|
||||||
|
introduced lately. NXGL has suffered some bit-rot from not being used
|
||||||
|
in some of the most recent ports.
|
||||||
|
|
||||||
|
|||||||
@@ -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 16, 2009</p>
|
<p>Last Updated: December 17, 2009</p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
@@ -1626,7 +1626,12 @@ nuttx-2010.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
|||||||
* Changed ALL references to non-standard fixed-size types (like uint32,
|
* Changed ALL references to non-standard fixed-size types (like uint32,
|
||||||
ubyte, etc.) to standard types (like uint32_t, uint8_t, etc.) from
|
ubyte, etc.) to standard types (like uint32_t, uint8_t, etc.) from
|
||||||
stdint.h. Use type bool and {true, false} from stdbool. This effected
|
stdint.h. Use type bool and {true, false} from stdbool. This effected
|
||||||
most of the files in the system!
|
most of the files in the system! Almost all configurations have been
|
||||||
|
re-built and many have been re-verified in order to get confidence in
|
||||||
|
these changes.
|
||||||
|
* graphics/ and examples/nx - Fix numerous build errors that have been
|
||||||
|
introduced lately. NXGL has suffered some bit-rot from not being used
|
||||||
|
in some of the most recent ports.
|
||||||
|
|
||||||
pascal-2010.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
pascal-2010.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||||
|
|
||||||
|
|||||||
@@ -39,6 +39,7 @@
|
|||||||
|
|
||||||
#include <nuttx/config.h>
|
#include <nuttx/config.h>
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
|||||||
@@ -39,6 +39,7 @@
|
|||||||
|
|
||||||
#include <nuttx/config.h>
|
#include <nuttx/config.h>
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
#include <nuttx/nxglib.h>
|
#include <nuttx/nxglib.h>
|
||||||
|
|||||||
@@ -40,6 +40,7 @@
|
|||||||
#include <nuttx/config.h>
|
#include <nuttx/config.h>
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
#include <nuttx/nxglib.h>
|
#include <nuttx/nxglib.h>
|
||||||
@@ -145,7 +146,7 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX)
|
|||||||
FAR NXF_PIXEL_T *dptr;
|
FAR NXF_PIXEL_T *dptr;
|
||||||
FAR const uint8_t *sptr;
|
FAR const uint8_t *sptr;
|
||||||
uint8_t bmbyte;
|
uint8_t bmbyte;
|
||||||
uint8_t bmbit;
|
int bmbit;
|
||||||
int row;
|
int row;
|
||||||
int col;
|
int col;
|
||||||
int bmndx;
|
int bmndx;
|
||||||
|
|||||||
@@ -40,6 +40,7 @@
|
|||||||
#include <nuttx/config.h>
|
#include <nuttx/config.h>
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
#include <nuttx/nxfonts.h>
|
#include <nuttx/nxfonts.h>
|
||||||
@@ -137,7 +138,7 @@ FAR const struct nx_font_s *nxf_getfontset(void)
|
|||||||
FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16_t ch)
|
FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16_t ch)
|
||||||
{
|
{
|
||||||
FAR const struct nx_fontset_s *set = nxf_getglyphset(ch);
|
FAR const struct nx_fontset_s *set = nxf_getglyphset(ch);
|
||||||
FAR struct nx_fontbitmap_s *bm = NULL;
|
FAR const struct nx_fontbitmap_s *bm = NULL;
|
||||||
|
|
||||||
if (set)
|
if (set)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -95,6 +95,7 @@ int nx_kbdchin(NXHANDLE handle, uint8_t ch)
|
|||||||
{
|
{
|
||||||
wnd->cb->kbdin(wnd, 1, &ch, wnd->arg);
|
wnd->cb->kbdin(wnd, 1, &ch, wnd->arg);
|
||||||
}
|
}
|
||||||
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_NX_KBD */
|
#endif /* CONFIG_NX_KBD */
|
||||||
|
|||||||
@@ -94,6 +94,7 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch)
|
|||||||
{
|
{
|
||||||
wnd->cb->kbdin(wnd, nch, ch, wnd->arg);
|
wnd->cb->kbdin(wnd, nch, ch, wnd->arg);
|
||||||
}
|
}
|
||||||
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_NX_KBD */
|
#endif /* CONFIG_NX_KBD */
|
||||||
|
|||||||
@@ -194,6 +194,7 @@ int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_NX_MOUSE */
|
#endif /* CONFIG_NX_MOUSE */
|
||||||
|
|||||||
Reference in New Issue
Block a user