Fixing MESS-specific category tokenization

This commit is contained in:
Nathan Woods 2008-03-12 01:58:49 +00:00
parent 86b798b37a
commit 61b009597e
2 changed files with 6 additions and 2 deletions

View File

@ -1984,6 +1984,9 @@ static void input_port_detokenize(input_port_init_params *param, const input_por
while (entrytype != INPUT_TOKEN_END) while (entrytype != INPUT_TOKEN_END)
{ {
UINT32 mask, defval, type, val; UINT32 mask, defval, type, val;
#ifdef MESS
UINT16 category;
#endif /* MESS */
/* unpack the token from the first entry */ /* unpack the token from the first entry */
TOKEN_GET_UINT32_UNPACK1(ipt, entrytype, 8); TOKEN_GET_UINT32_UNPACK1(ipt, entrytype, 8);
@ -2245,10 +2248,11 @@ static void input_port_detokenize(input_port_init_params *param, const input_por
case INPUT_TOKEN_CATEGORY_SETTING: case INPUT_TOKEN_CATEGORY_SETTING:
TOKEN_UNGET_UINT32(ipt); TOKEN_UNGET_UINT32(ipt);
TOKEN_GET_UINT64_UNPACK2(ipt, entrytype, 8, defval, 32); TOKEN_GET_UINT64_UNPACK3(ipt, entrytype, 8, defval, 32, category, 16);
port = input_port_initialize(param, IPT_CATEGORY_SETTING, modify_tag, 0, defval); port = input_port_initialize(param, IPT_CATEGORY_SETTING, modify_tag, 0, defval);
seq_index[0] = seq_index[1] = seq_index[2] = 0; seq_index[0] = seq_index[1] = seq_index[2] = 0;
port->name = input_port_string_from_token(*ipt++); port->name = input_port_string_from_token(*ipt++);
port->category = category;
break; break;
#endif /* MESS */ #endif /* MESS */

View File

@ -849,7 +849,7 @@ struct _ext_inp_header
TOKEN_STRING(_name), TOKEN_STRING(_name),
#define PORT_CATEGORY_ITEM(_default,_name,_category) \ #define PORT_CATEGORY_ITEM(_default,_name,_category) \
TOKEN_UINT64_PACK3(INPUT_TOKEN_CATEGORY_SETTING, 8, _default, 32, _category, 32), \ TOKEN_UINT64_PACK3(INPUT_TOKEN_CATEGORY_SETTING, 8, _default, 32, _category, 16), \
TOKEN_STRING(_name), TOKEN_STRING(_name),
#endif /* MESS */ #endif /* MESS */