From: asterix Date: Fri, 11 Sep 2009 16:06:07 +0000 (+0000) Subject: Rename file to messages. X-Git-Tag: 2.2.0~37 X-Git-Url: https://codewiz.org/gitweb?p=bertos.git;a=commitdiff_plain;h=e774ce65644075ed4f102a151a4e38db350b48d0 Rename file to messages. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2931 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/bertos/mware/messages.c b/bertos/mware/messages.c new file mode 100644 index 00000000..52c720c4 --- /dev/null +++ b/bertos/mware/messages.c @@ -0,0 +1,67 @@ +/** + * \file + * + * + * \brief Messages for LCD. + * + * \version $Id$ + * + * \author Bernie Innocenti + * \author Stefano Fedrigo + */ + +#include "messages.h" + +/** + * Array of pointers to localized strings. Should be filled + * by localization stuff, but not for now. + */ +const char *msg_strings[MSG_COUNT] = { + 0, + // TODO: add your strings here +}; + +/* Buffer for catalog file */ +/* char msg_buf[MSG_BUFSIZE]; */ + + +/* The following does not work (move string tables into the DMSG/CMSG segments) + * #pragma memory=dataseg(DMSG) + * #pragma memory=constseg(CMSG) + */ + + +/** + * Untranslated constant strings used more than once are + * grouped here to save ROM space. + */ +const char str_empty[] = ""; + diff --git a/bertos/mware/messages.h b/bertos/mware/messages.h new file mode 100644 index 00000000..0eaff8fd --- /dev/null +++ b/bertos/mware/messages.h @@ -0,0 +1,68 @@ +/** + * \file + * + * + * \brief Definitions of constant string messages. + * + * \version $Id$ + * + * \author Bernie Innocenti + * \author Stefano Fedrigo + */ + +#ifndef MWARE_MESSAGES_H +#define MWARE_MESSAGES_H + +enum +{ + MSG_NULL, + + // TODO: add your labels here. + + MSG_COUNT +}; + +#warning FIXME:Revise me! + +#define MSG_BUFSIZE 6144 /* FIXME: how much? */ + +/* String tables */ +/* extern const char *msg_strings const [MSG_COUNT]; */ +/* extern char msg_buf[MSG_BUFSIZE]; */ + + +/* Macros to access translated messages */ +#define MSG(x) msg_strings[x] +#define PTRMSG(x) ((x) < (const_iptr_t)256 ? msg_strings[(unsigned int)(x)] : (const char *)(x)) + + +#endif /* MWARE_MESSAGES_H */ + diff --git a/bertos/mware/msg.c b/bertos/mware/msg.c deleted file mode 100644 index 52c720c4..00000000 --- a/bertos/mware/msg.c +++ /dev/null @@ -1,67 +0,0 @@ -/** - * \file - * - * - * \brief Messages for LCD. - * - * \version $Id$ - * - * \author Bernie Innocenti - * \author Stefano Fedrigo - */ - -#include "messages.h" - -/** - * Array of pointers to localized strings. Should be filled - * by localization stuff, but not for now. - */ -const char *msg_strings[MSG_COUNT] = { - 0, - // TODO: add your strings here -}; - -/* Buffer for catalog file */ -/* char msg_buf[MSG_BUFSIZE]; */ - - -/* The following does not work (move string tables into the DMSG/CMSG segments) - * #pragma memory=dataseg(DMSG) - * #pragma memory=constseg(CMSG) - */ - - -/** - * Untranslated constant strings used more than once are - * grouped here to save ROM space. - */ -const char str_empty[] = ""; - diff --git a/bertos/mware/msg.h b/bertos/mware/msg.h deleted file mode 100644 index 0eaff8fd..00000000 --- a/bertos/mware/msg.h +++ /dev/null @@ -1,68 +0,0 @@ -/** - * \file - * - * - * \brief Definitions of constant string messages. - * - * \version $Id$ - * - * \author Bernie Innocenti - * \author Stefano Fedrigo - */ - -#ifndef MWARE_MESSAGES_H -#define MWARE_MESSAGES_H - -enum -{ - MSG_NULL, - - // TODO: add your labels here. - - MSG_COUNT -}; - -#warning FIXME:Revise me! - -#define MSG_BUFSIZE 6144 /* FIXME: how much? */ - -/* String tables */ -/* extern const char *msg_strings const [MSG_COUNT]; */ -/* extern char msg_buf[MSG_BUFSIZE]; */ - - -/* Macros to access translated messages */ -#define MSG(x) msg_strings[x] -#define PTRMSG(x) ((x) < (const_iptr_t)256 ? msg_strings[(unsigned int)(x)] : (const char *)(x)) - - -#endif /* MWARE_MESSAGES_H */ -