Previous 15994 Revisions Next

r9665 Friday 26th November, 2010 at 08:28:18 UTC by Miodrag Milanović
- Fixed issue with empty slot
- Default for writeconfig is now 0 since it is not needed anymore
- Fixed handling of mounted devices on hard reset
[src/emu]devimage.c emuopts.c emuopts.h fileio.h mame.c
[src/mess/formats]ti85_ser.c

src/emu/emuopts.c
r9664r9665
2828   /* config options */
2929   { NULL,                          NULL,        OPTION_HEADER,     "CORE CONFIGURATION OPTIONS" },
3030   { "readconfig;rc",               "1",         OPTION_BOOLEAN,    "enable loading of configuration files" },
31#ifdef MESS
32   { "writeconfig;wc",             "1",        OPTION_BOOLEAN,    "writes configuration to (driver).ini on exit" },
33#else
3431   { "writeconfig;wc",             "0",        OPTION_BOOLEAN,    "writes configuration to (driver).ini on exit" },
35#endif /* MESS */
3632
3733   /* seach path options */
3834   { NULL,                          NULL,        OPTION_HEADER,     "CORE SEARCH PATH OPTIONS" },
3935   { "rompath;rp;biospath;bp",      "roms",      0,                 "path to ROMsets and hard disk images" },
40#ifdef MESS
4136   { "hashpath;hash_directory;hash","hash",      0,                 "path to hash files" },
42#endif /* MESS */
4337   { "samplepath;sp",               "samples",   0,                 "path to samplesets" },
4438   { "artpath;artwork_directory",   "artwork",   0,                 "path to artwork files" },
4539   { "ctrlrpath;ctrlr_directory",   "ctrlr",     0,                 "path to controller definitions" },
src/emu/emuopts.h
r9664r9665
4343
4444/* core search path options */
4545#define OPTION_ROMPATH            "rompath"
46#ifdef MESS
4746#define OPTION_HASHPATH            "hashpath"
48#endif
4947#define OPTION_SAMPLEPATH         "samplepath"
5048#define OPTION_ARTPATH            "artpath"
5149#define OPTION_CTRLRPATH         "ctrlrpath"
src/emu/devimage.c
r9664r9665
528528    m_year.reset();
529529    m_playable.reset();
530530    m_extrainfo.reset();
531   m_basename.reset();
531532    m_basename_noext.reset();
532533   m_filetype.reset();
533534
src/emu/mame.c
r9664r9665
566566   file_error filerr;
567567   mame_file *file;
568568
569   /* update game name so depending callback options could be added */
570   if (priority==OPTION_PRIORITY_DRIVER_INI) {
571      options_force_option_callback(options, OPTION_GAMENAME, name, priority);
572   }
573
569574   /* don't parse if it has been disabled */
570575   if (!options_get_bool(options, OPTION_READCONFIG))
571576      return FALSE;
r9664r9665
576581   if (filerr != FILERR_NONE)
577582      return FALSE;
578583
579   /* update game name so depending callback options could be added */
580   if (priority==OPTION_PRIORITY_DRIVER_INI) {
581      options_force_option_callback(options, OPTION_GAMENAME, name, priority);
582   }
583
584584   /* parse the file and close it */
585585   mame_printf_verbose("Parsing %s.ini\n", name);
586586   options_parse_ini_file(options, mame_core_file(file), priority);
src/emu/fileio.h
r9664r9665
2828#define SEARCHPATH_DEBUGLOG        NULL
2929
3030#define SEARCHPATH_ROM             OPTION_ROMPATH
31#ifdef MESS
32#define SEARCHPATH_IMAGE           NULL
33#define SEARCHPATH_HASH            OPTION_HASHPATH
34#else
3531#define SEARCHPATH_IMAGE           OPTION_ROMPATH
36#define SEARCHPATH_HASH            NULL
37#endif
32#define SEARCHPATH_HASH            OPTION_HASHPATH
3833#define SEARCHPATH_SAMPLE          OPTION_SAMPLEPATH
3934#define SEARCHPATH_ARTWORK         OPTION_ARTPATH
4035#define SEARCHPATH_CTRLR           OPTION_CTRLRPATH
src/mess/formats/ti85_ser.c
r9664r9665
889889            ti85serial->variable_number = 0;
890890            ti85serial->status =  TI85_SEND_STOP;
891891            sprintf (var_file_name, "%08d.85g", ti85serial->var_file_number);
892            filerr = mame_fopen(SEARCHPATH_IMAGE, var_file_name, OPEN_FLAG_READ | OPEN_FLAG_WRITE | OPEN_FLAG_CREATE, &var_file);
892            filerr = mame_fopen(NULL, var_file_name, OPEN_FLAG_READ | OPEN_FLAG_WRITE | OPEN_FLAG_CREATE, &var_file);
893893            if (filerr == FILERR_NONE)
894894            {
895895               mame_fwrite(var_file, ti85serial->var_file_data, ti85serial->var_file_size);
r9664r9665
10311031               ti85serial->backup_file_data[0x42+0x06+ti85serial->backup_data_size[0]+ti85serial->backup_data_size[1]+ti85serial->backup_data_size[2]] = ti85_calculate_checksum(ti85serial->backup_file_data+0x37, 0x42+ti85serial->backup_data_size[0]+ti85serial->backup_data_size[1]+ti85serial->backup_data_size[2]+0x06-0x37)&0x00ff;
10321032               ti85serial->backup_file_data[0x42+0x06+ti85serial->backup_data_size[0]+ti85serial->backup_data_size[1]+ti85serial->backup_data_size[2]+0x01] = (ti85_calculate_checksum(ti85serial->backup_file_data+0x37, 0x42+ti85serial->backup_data_size[0]+ti85serial->backup_data_size[1]+ti85serial->backup_data_size[2]+0x06-0x37)&0xff00)>>8;
10331033               sprintf (backup_file_name, "%08d.85b", ti85serial->backup_file_number);
1034               filerr = mame_fopen(SEARCHPATH_IMAGE, backup_file_name, OPEN_FLAG_READ | OPEN_FLAG_WRITE | OPEN_FLAG_CREATE, &backup_file);
1034               filerr = mame_fopen(NULL, backup_file_name, OPEN_FLAG_READ | OPEN_FLAG_WRITE | OPEN_FLAG_CREATE, &backup_file);
10351035               if (filerr == FILERR_NONE)
10361036               {
10371037                  mame_fwrite(backup_file, ti85serial->backup_file_data, 0x42+0x06+ti85serial->backup_data_size[0]+ti85serial->backup_data_size[1]+ti85serial->backup_data_size[2]+0x02);
r9664r9665
10951095         {
10961096            ti85_convert_stream_to_data (ti85serial->receive_buffer, 1030*8, ti85serial->receive_data);
10971097            sprintf (image_file_name, "%08d.85i", ti85serial->image_file_number);
1098            filerr = mame_fopen(SEARCHPATH_IMAGE, image_file_name, OPEN_FLAG_READ | OPEN_FLAG_WRITE | OPEN_FLAG_CREATE, &image_file);
1098            filerr = mame_fopen(NULL, image_file_name, OPEN_FLAG_READ | OPEN_FLAG_WRITE | OPEN_FLAG_CREATE, &image_file);
10991099            if (filerr == FILERR_NONE)
11001100            {
11011101               image_file_data = (UINT8*)malloc (0x49+1008);

Previous 15994 Revisions Next


© 1998-2018 The MESS Team