From fe71dddb9c1711ed8109fd3aa013a898b0d6fede Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 29 Sep 2011 18:26:56 +0000 Subject: Add sim touchscreen bugfixes git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3999 42af7a65-404d-4744-a932-0658087f49c3 --- apps/examples/touchscreen/tc_main.c | 14 +++++++------- nuttx/arch/sim/src/up_touchscreen.c | 26 ++++++++++++++------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/apps/examples/touchscreen/tc_main.c b/apps/examples/touchscreen/tc_main.c index 53e7b1291..00e1fbab0 100644 --- a/apps/examples/touchscreen/tc_main.c +++ b/apps/examples/touchscreen/tc_main.c @@ -189,13 +189,13 @@ int MAIN_NAME(int argc, char *argv[]) message("Sample :\n"); message(" npoints : %d\n", sample.npoints); message("Point 1 :\n"); - message(" id : %d\n", sample.point[1].id); - message(" flags : %02x\n", sample.point[1].flags); - message(" x : %d\n", sample.point[1].x); - message(" y : %d\n", sample.point[1].y); - message(" h : %d\n", sample.point[1].h); - message(" w : %d\n", sample.point[1].w); - message(" pressure : %d\n", sample.point[1].pressure); + message(" id : %d\n", sample.point[0].id); + message(" flags : %02x\n", sample.point[0].flags); + message(" x : %d\n", sample.point[0].x); + message(" y : %d\n", sample.point[0].y); + message(" h : %d\n", sample.point[0].h); + message(" w : %d\n", sample.point[0].w); + message(" pressure : %d\n", sample.point[0].pressure); } } diff --git a/nuttx/arch/sim/src/up_touchscreen.c b/nuttx/arch/sim/src/up_touchscreen.c index 4f4bf2664..ecbe61b36 100644 --- a/nuttx/arch/sim/src/up_touchscreen.c +++ b/nuttx/arch/sim/src/up_touchscreen.c @@ -134,9 +134,9 @@ struct up_dev_s static void up_notify(FAR struct up_dev_s *priv); static int up_sample(FAR struct up_dev_s *priv, - FAR struct up_sample_s *sample); + FAR struct up_sample_s *sample); static int up_waitsample(FAR struct up_dev_s *priv, - FAR struct up_sample_s *sample); + FAR struct up_sample_s *sample); /* Character driver methods */ @@ -274,7 +274,7 @@ static int up_sample(FAR struct up_dev_s *priv, ****************************************************************************/ static int up_waitsample(FAR struct up_dev_s *priv, - FAR struct up_sample_s *sample) + FAR struct up_sample_s *sample) { irqstate_t flags; int ret; @@ -298,7 +298,7 @@ static int up_waitsample(FAR struct up_dev_s *priv, sem_post(&priv->devsem); /* Try to get the a sample... if we cannot, then wait on the semaphore - * that is posted when new sample data is availble. + * that is posted when new sample data is available. */ while (up_sample(priv, sample) < 0) @@ -375,9 +375,9 @@ static int up_close(FAR struct file *filep) static ssize_t up_read(FAR struct file *filep, FAR char *buffer, size_t len) { FAR struct inode *inode; - FAR struct up_dev_s *priv; + FAR struct up_dev_s *priv; FAR struct touch_sample_s *report; - struct up_sample_s sample; + struct up_sample_s sample; int ret; ivdbg("len=%d\n", len); @@ -449,6 +449,8 @@ static ssize_t up_read(FAR struct file *filep, FAR char *buffer, size_t len) report->point[0].id = priv->id; report->point[0].x = sample.x; report->point[0].y = sample.y; + report->point[0].h = 1; + report->point[0].w = 1; report->point[0].pressure = 42; /* Report the appropriate flags */ @@ -527,14 +529,14 @@ static int up_ioctl(FAR struct file *filep, int cmd, unsigned long arg) #ifndef CONFIG_DISABLE_POLL static int up_poll(FAR struct file *filep, FAR struct pollfd *fds, - bool setup) + bool setup) { - FAR struct inode *inode; + FAR struct inode *inode; FAR struct up_dev_s *priv; - pollevent_t eventset; - int ndx; - int ret = OK; - int i; + pollevent_t eventset; + int ndx; + int ret = OK; + int i; ivdbg("setup: %d\n", (int)setup); DEBUGASSERT(filep && fds); -- cgit v1.2.3