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

examples/hidkbd: Reuse lib_meminstream_s and remove hidbkd_instream_s

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-12-04 19:52:34 +08:00 committed by Petro Karashchenko
parent 2c56945fee
commit 00dd4affea
1 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
examples/hidkbd/hidkbd_main.c
View File

@ -57,49 +57,10 @@
# undef CONFIG_EXAMPLES_HIDKBD_ENCODED
#endif
/****************************************************************************
* Private Types
****************************************************************************/
#ifdef CONFIG_EXAMPLES_HIDKBD_ENCODED
struct hidbkd_instream_s
{
struct lib_instream_s stream;
FAR char *buffer;
ssize_t nbytes;
};
#endif
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Name: hidkbd_getstream
*
* Description:
* Get one character from the keyboard.
*
****************************************************************************/
#ifdef CONFIG_EXAMPLES_HIDKBD_ENCODED
static int hidkbd_getstream(FAR struct lib_instream_s *this)
{
FAR struct hidbkd_instream_s *kbdstream = \
(FAR struct hidbkd_instream_s *)this;
DEBUGASSERT(kbdstream && kbdstream->buffer);
if (kbdstream->nbytes > 0)
{
kbdstream->nbytes--;
kbdstream->stream.nget++;
return (int)*kbdstream->buffer++;
}
return EOF;
}
#endif
/****************************************************************************
* Name: hidkbd_decode
*
@ -111,7 +72,7 @@ static int hidkbd_getstream(FAR struct lib_instream_s *this)
#ifdef CONFIG_EXAMPLES_HIDKBD_ENCODED
static void hidkbd_decode(FAR char *buffer, ssize_t nbytes)
{
struct hidbkd_instream_s kbdstream;
struct lib_meminstream_s kbdstream;
struct kbd_getstate_s state;
uint8_t ch;
int ret;
@ -119,10 +80,7 @@ static void hidkbd_decode(FAR char *buffer, ssize_t nbytes)
/* Initialize */
memset(&state, 0, sizeof(struct kbd_getstate_s));
kbdstream.stream.getc = hidkbd_getstream;
kbdstream.stream.nget = 0;
kbdstream.buffer = buffer;
kbdstream.nbytes = nbytes;
lib_meminstream(&kbdstream, buffer, nbytes);
/* Loop until all of the bytes have been consumed. We implicitly assume
* that the escaped sequences do not cross buffer boundaries. That