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

Several bugfixes contributed by Petteri Aimonen

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5238 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-10-20 16:07:49 +00:00
parent 4f329c579d
commit afdb39b3b9
6 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog.txt
View File

@ -172,3 +172,14 @@
NxWidgets/NxWM unit tests. NxWidgets/NxWM unit tests.
1.4 2012-xx-xx Gregory Nutt <gnutt@nuttx.org> 1.4 2012-xx-xx Gregory Nutt <gnutt@nuttx.org>
* libnxwidgets/Makefile, NxWidgets/nxwm/Makefile, and
NxWidgets/UnitTests/nxwm/Makefile: Makefile improvements from
submitted by Petteri Aimonen. Other Makefiles in the UnitTests
directory probably also need these changes.
* libnxwidgets/src/ccallback.cxx: Fix misplaced #endif. Provided
by Petteri Aimonen.
* libnxwidgets/src/cnxserver.cxx: Reduce delay to allow NX server
to start. One second was un-necessarily long. Reduced to 50 MS.
Reduction suggested by Petteri Aimonen.

4
UnitTests/nxwm/Makefile
View File

@ -105,7 +105,7 @@ STACKSIZE = 2048
VPATH = VPATH =
all: .built all: chkcxx chklibnxwidgets chklibnxwm .built
.PHONY: clean depend context disclean chkcxx chklibnxwidgets chklibnxwm .PHONY: clean depend context disclean chkcxx chklibnxwidgets chklibnxwm
# Object file creation targets # Object file creation targets
@ -163,7 +163,7 @@ $(NXWIDGETS_LIB): # Just to keep make happy. chklibnxwidgets does the work.
$(NXWM_LIB): # Just to keep make happy. chklibnxwm does the work. $(NXWM_LIB): # Just to keep make happy. chklibnxwm does the work.
.built: chkcxx chklibnxwidgets chklibnxwm $(OBJS) $(NXWIDGETS_LIB) .built: $(OBJS) $(NXWIDGETS_LIB)
@( for obj in $(OBJS) ; do \ @( for obj in $(OBJS) ; do \
$(call ARCHIVE, $(BIN), $${obj}); \ $(call ARCHIVE, $(BIN), $${obj}); \
done ; ) done ; )

4
libnxwidgets/Makefile
View File

@ -92,7 +92,7 @@ CXXFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(NXWIDGETDIR
DEPPATH = --dep-path src DEPPATH = --dep-path src
VPATH = src VPATH = src
all: $(BIN) all: check_nuttx $(BIN)
.PHONY = check_nuttx depend clean distclean export .PHONY = check_nuttx depend clean distclean export
$(AOBJS): %$(OBJEXT): %.S $(AOBJS): %$(OBJEXT): %.S
@ -122,7 +122,7 @@ check_nuttx:
fi; \ fi; \
) )
$(BIN): check_nuttx $(OBJS) $(BIN): $(OBJS)
@( for obj in $(OBJS) ; do \ @( for obj in $(OBJS) ; do \
$(call ARCHIVE, $@, $${obj}); \ $(call ARCHIVE, $@, $${obj}); \
done ; ) done ; )

3
libnxwidgets/src/ccallback.cxx
View File

@ -226,6 +226,8 @@ void CCallback::newKeyboardEvent(NXHANDLE hwnd, uint8_t nCh,
} }
} }
#endif // CONFIG_NX_KBD
/** /**
* This callback is the response from nx_block (or nxtk_block). Those * This callback is the response from nx_block (or nxtk_block). Those
* blocking interfaces are used to assure that no further messages are * blocking interfaces are used to assure that no further messages are
@ -260,4 +262,3 @@ void CCallback::windowBlocked(NXWINDOW hwnd, FAR void *arg1, FAR void *arg2)
} }
#endif #endif
#endif // CONFIG_NX_KBD

2
libnxwidgets/src/cnxserver.cxx
View File

@ -225,7 +225,7 @@ bool CNxServer::connect(void)
// Wait a bit to let the server get started // Wait a bit to let the server get started
sleep(1); usleep(50*1000);
// Connect to the server // Connect to the server

4
nxwm/Makefile
View File

@ -97,7 +97,7 @@ CXXFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(NXWIDGETDIR
DEPPATH = --dep-path src DEPPATH = --dep-path src
VPATH = src VPATH = src
all: $(BIN) all: check_nuttx $(BIN)
.PHONY = check_nuttx depend clean distclean export .PHONY = check_nuttx depend clean distclean export
$(AOBJS): %$(OBJEXT): %.S $(AOBJS): %$(OBJEXT): %.S
@ -127,7 +127,7 @@ check_nuttx:
fi; \ fi; \
) )
$(BIN): check_nuttx $(OBJS) $(BIN): $(OBJS)
@( for obj in $(OBJS) ; do \ @( for obj in $(OBJS) ; do \
$(call ARCHIVE, $@, $${obj}); \ $(call ARCHIVE, $@, $${obj}); \
done ; ) done ; )