MESS-specific fixes

This commit is contained in:
Nathan Woods 2008-08-20 11:31:21 +00:00
parent c6e6c95244
commit 57d3cb91e3
2 changed files with 5 additions and 2 deletions

View File

@ -2385,6 +2385,7 @@ static input_port_config *port_config_detokenize(input_port_config *listhead, co
input_field_config *curfield = NULL;
input_port_config *curport = NULL;
input_port_value maskbits = 0;
UINT16 category; /* (MESS-specific) category */
/* loop over tokens until we hit the end */
while (entrytype != INPUT_TOKEN_END)
@ -2936,7 +2937,7 @@ static input_port_config *port_config_detokenize(input_port_config *listhead, co
curfield->name = input_port_string_from_token(*ipt++);
break;
/* configuration setting */
/* category setting */
case INPUT_TOKEN_CATEGORY_SETTING:
TOKEN_UNGET_UINT32(ipt);
if (curfield == NULL)
@ -2946,8 +2947,9 @@ static input_port_config *port_config_detokenize(input_port_config *listhead, co
TOKEN_SKIP_STRING(ipt);
break;
}
TOKEN_GET_UINT64_UNPACK2(ipt, entrytype, 8, defval, 32);
TOKEN_GET_UINT64_UNPACK3(ipt, entrytype, 8, defval, 32, category, 16);
cursetting = setting_config_alloc(curfield, defval & curfield->mask, input_port_string_from_token(*ipt++));
cursetting->category = category;
break;
/* analog adjuster definition */

View File

@ -555,6 +555,7 @@ struct _input_setting_config
input_port_value value; /* value of the bits in this setting */
input_condition condition; /* condition under which this setting is valid */
const char * name; /* user-friendly name to display */
UINT16 category; /* (MESS-specific) category */
};