Previous 15994 Revisions Next

r2322 Tuesday 8th April, 2008 at 00:31:52 UTC by Nathan Woods
Added a machine_config* parameter to image_device_getinfo()
[src/emu]devintrf.c
[src/mess]climess.c configms.c image.c image.h infomess.c mess.c messopts.c messopts.h
[src/mess/osd/windows]menu.c
[src/mess/osd/winui]devview.c devview.h messui.c msuiutil.c optionsms.c optionsms.h softwarepicker.c
[src/mess/tools/messtest]testmess.c

src/emu/devintrf.c
r2321r2322
108108   device->static_config = NULL;
109109   device->inline_config = (configlen == 0) ? NULL : (device->tag + strlen(tag) + 1);
110110   device->token = NULL;
111   device->machine = NULL;
111112   strcpy(device->tag, tag);
112113
113114   /* reset the inline_config to 0 */
src/mess/climess.c
r2321r2322
7272
7373         for (dev = image_device_first(config); dev != NULL; dev = image_device_next(dev))
7474         {
75            info = image_device_getinfo(dev);
75            info = image_device_getinfo(config, dev);
7676
7777            src = info.file_extensions;
7878            name = info.instance_name;
src/mess/configms.c
r2321r2322
4040         {
4141            for (dev = image_device_first(Machine->config); (image == NULL) && (dev != NULL); dev = image_device_next(dev))
4242            {
43               info = image_device_getinfo(dev);
43               info = image_device_getinfo(Machine->config, dev);
4444               if (!strcmp(dev_instance, info.instance_name))
4545                  image = dev;
4646            }
r2321r2322
7575   {
7676      for (image = image_device_first(Machine->config); image != NULL; image = image_device_next(image))
7777      {
78         info = image_device_getinfo(image);
78         info = image_device_getinfo(Machine->config, image);
7979         dev_instance = info.instance_name;
8080
8181         node = xml_add_child(parentnode, "device", NULL);
src/mess/mess.c
r2321r2322
139139   for (image = image_device_first(machine->config); image != NULL; image = image_device_next(image))
140140   {
141141      /* get the device info */
142      info = image_device_getinfo(image);
142      info = image_device_getinfo(machine->config, image);
143143
144144      /* is an image specified for this image */
145      image_name = mess_get_device_option(image);
145      image_name = mess_get_device_option(&info);
146146
147147      if ((image_name != NULL) && (image_name[0] != '\0'))
148148      {
src/mess/tools/messtest/testmess.c
r2321r2322
690690         device_typename(device_type), device_slot);
691691      return;
692692   }
693   info = image_device_getinfo(image);
693   info = image_device_getinfo(machine->config, image);
694694   file_extensions = info.file_extensions;
695695
696696   /* is an image format specified? */
src/mess/image.c
r2321r2322
405405   can be called by front end code
406406-------------------------------------------------*/
407407
408image_device_info image_device_getinfo(const device_config *device)
408image_device_info image_device_getinfo(const machine_config *config, const device_config *device)
409409{
410410   const struct IODevice *iodev;
411411   const char *s;
412412   image_device_info info;
413   
413
414   /* sanity checks */
415   assert((device->machine == NULL) || (device->machine->config == config));
416
417   /* clear return value */
414418   memset(&info, 0, sizeof(info));
415419
416420   /* retrieve type */
src/mess/infomess.c
r2321r2322
3636
3737   for (dev = image_device_first(config); dev != NULL; dev = image_device_next(dev))
3838   {
39      info = image_device_getinfo(dev);
39      info = image_device_getinfo(config, dev);
4040
4141      /* print out device type */
4242      fprintf(out, "\t\t<device type=\"%s\"", xml_normalize_string(device_typename(info.type)));
src/mess/image.h
r2321r2322
137137/* ----- analysis ----- */
138138
139139/* returns info on a device - can be called by front end code */
140image_device_info image_device_getinfo(const device_config *device);
140image_device_info image_device_getinfo(const machine_config *config, const device_config *device);
141141
142142/* checks to see if a particular devices uses a certain file extension */
143143int image_device_uses_file_extension(const device_config *device, const char *file_extension);
src/mess/osd/windows/menu.c
r2321r2322
797797//   build_generic_filter
798798//============================================================
799799
800static void build_generic_filter(const device_config *dev, int is_save, char *filter, size_t filter_len)
800static void build_generic_filter(const device_config *device, int is_save, char *filter, size_t filter_len)
801801{
802802   char *s;
803803   const char *file_extensions;
804   image_device_info info = image_device_getinfo(dev);
804   image_device_info info = image_device_getinfo(device->machine->config, device);
805805
806806   s = filter;
807807
r2321r2322
13531353   // then set up the actual devices
13541354   for (img = image_device_first(machine->config); img != NULL; img = image_device_next(img))
13551355   {
1356      image_device_info info = image_device_getinfo(img);
1356      image_device_info info = image_device_getinfo(machine->config, img);
13571357
13581358      new_item = ID_DEVICE_0 + (image_absolute_index(img) * DEVOPTION_MAX);
13591359      flags_for_exists = MF_STRING;
src/mess/osd/winui/optionsms.h
r2321r2322
4242void SetHashDirs(const char *dir);
4343const char *GetHashDirs(void);
4444
45void SetSelectedSoftware(int driver_index, const device_config *device, const char *software);
46const char *GetSelectedSoftware(int driver_index, const device_config *device);
45void SetSelectedSoftware(int driver_index, const machine_config *config, const device_config *device, const char *software);
46const char *GetSelectedSoftware(int driver_index, const machine_config *config, const device_config *device);
4747
4848void SetExtraSoftwarePaths(int driver_index, const char *extra_paths);
4949const char *GetExtraSoftwarePaths(int driver_index);
src/mess/osd/winui/messui.c
r2321r2322
6666static void SoftwarePicker_LeavingItem(HWND hwndSoftwarePicker, int nItem);
6767static void SoftwarePicker_EnteringItem(HWND hwndSoftwarePicker, int nItem);
6868
69static BOOL DevView_GetOpenFileName(HWND hwndDevView, const device_config *dev, LPTSTR pszFilename, UINT nFilenameLength);
70static BOOL DevView_GetCreateFileName(HWND hwndDevView, const device_config *dev, LPTSTR pszFilename, UINT nFilenameLength);
71static void DevView_SetSelectedSoftware(HWND hwndDevView, int nDriverIndex, const device_config *dev, LPCTSTR pszFilename);
72static LPCTSTR DevView_GetSelectedSoftware(HWND hwndDevView, int nDriverIndex, const device_config *dev, LPTSTR pszBuffer, UINT nBufferLength);
69static BOOL DevView_GetOpenFileName(HWND hwndDevView, const machine_config *config, const device_config *dev, LPTSTR pszFilename, UINT nFilenameLength);
70static BOOL DevView_GetCreateFileName(HWND hwndDevView, const machine_config *config, const device_config *dev, LPTSTR pszFilename, UINT nFilenameLength);
71static void DevView_SetSelectedSoftware(HWND hwndDevView, int nDriverIndex, const machine_config *config, const device_config *dev, LPCTSTR pszFilename);
72static LPCTSTR DevView_GetSelectedSoftware(HWND hwndDevView, int nDriverIndex, const machine_config *config, const device_config *dev, LPTSTR pszBuffer, UINT nBufferLength);
7373
7474#ifdef MAME_DEBUG
7575static void MessTestsBegin(void);
r2321r2322
353353   nPos = 0;
354354   for (dev = image_device_first(config); dev != NULL; dev = image_device_next(dev))
355355   {
356      image_device_info info = image_device_getinfo(dev);
356      image_device_info info = image_device_getinfo(config, dev);
357357
358358      // confirm any mandatory devices are loaded
359359      if (info.must_be_loaded)
360360      {
361         pszSoftware = GetSelectedSoftware(drvindex, dev);
361         pszSoftware = GetSelectedSoftware(drvindex, config, dev);
362362         if (!pszSoftware || !*pszSoftware)
363363         {
364364            snprintf(szMessage, sizeof(szMessage) / sizeof(szMessage[0]),
r2321r2322
386386
387387
388388// this is a wrapper call to wrap the idiosycracies of SetSelectedSoftware()
389static void InternalSetSelectedSoftware(int drvindex, const device_config *device, const char *pszSoftware)
389static void InternalSetSelectedSoftware(int drvindex, const machine_config *config, const device_config *device, const char *pszSoftware)
390390{
391391   if (!pszSoftware)
392392      pszSoftware = "";
393393
394394   // only call SetSelectedSoftware() if this value is different
395   if (strcmp(GetSelectedSoftware(drvindex, device), pszSoftware))
395   if (strcmp(GetSelectedSoftware(drvindex, config, device), pszSoftware))
396396   {
397      SetSelectedSoftware(drvindex, device, pszSoftware);
397      SetSelectedSoftware(drvindex, config, device, pszSoftware);
398398   }
399399}
400400
r2321r2322
417417   {
418418      for (device = image_device_first(config); device != NULL; device = image_device_next(device))
419419      {
420         s = GetSelectedSoftware(drvindex, device);
420         s = GetSelectedSoftware(drvindex, config, device);
421421         if ((s != NULL) && !mame_stricmp(s, pszFilename))
422422            break;
423423      }
r2321r2322
445445   if (device != NULL)
446446   {
447447      // place the image
448      InternalSetSelectedSoftware(drvindex, device, pszFilename);
448      InternalSetSelectedSoftware(drvindex, config, device, pszFilename);
449449   }
450450   else
451451   {
r2321r2322
500500
501501   for (dev = image_device_first(config); dev != NULL; dev = image_device_next(dev))
502502   {
503      pszSoftware = GetSelectedSoftware(drvindex, dev);
503      pszSoftware = GetSelectedSoftware(drvindex, config, dev);
504504      if (pszSoftware && *pszSoftware)
505505      {
506506         i = SoftwarePicker_LookupIndex(hwndSoftware, pszSoftware);
r2321r2322
569569    const char *ext;
570570} mess_image_type;
571571
572static BOOL CommonFileImageDialog(LPTSTR the_last_directory, common_file_dialog_proc cfd, LPTSTR filename, mess_image_type *imagetypes)
572static BOOL CommonFileImageDialog(LPTSTR the_last_directory, common_file_dialog_proc cfd, LPTSTR filename, const machine_config *config, mess_image_type *imagetypes)
573573{
574574    BOOL success;
575575    OPENFILENAME of;
r2321r2322
611611      if (!imagetypes[i].dev)
612612         typname = "Compressed images";
613613      else
614         typname = lookupdevice(image_device_getinfo(imagetypes[i].dev).type)->dlgname;
614         typname = lookupdevice(image_device_getinfo(config, imagetypes[i].dev).type)->dlgname;
615615
616616        strcpy(s, typname);
617617        s += strlen(s);
r2321r2322
695695      /* special case; all non-printer devices */
696696      for (dev = image_device_first(config); dev != NULL; dev = image_device_next(dev))
697697      {
698         image_device_info info = image_device_getinfo(dev);
698         image_device_info info = image_device_getinfo(config, dev);
699699
700700         if (info.type != IO_PRINTER)
701701            SetupImageTypes(config, &types[num_extensions], count - num_extensions, FALSE, dev);
r2321r2322
704704   }
705705   else
706706   {
707      image_device_info info = image_device_getinfo(dev);
707      image_device_info info = image_device_getinfo(config, dev);
708708      const char *ext = info.file_extensions;
709709
710710      if (ext != NULL)
r2321r2322
744744
745745   SetupImageTypes(config, imagetypes, sizeof(imagetypes) / sizeof(imagetypes[0]), TRUE, dev);
746746
747   if (CommonFileImageDialog(last_directory, cfd, filename, imagetypes))
747   if (CommonFileImageDialog(last_directory, cfd, filename, config, imagetypes))
748748   {
749749      utf8_filename = utf8_from_tstring(filename);
750750      if( !utf8_filename )
r2321r2322
773773
774774
775775
776static BOOL DevView_GetOpenFileName(HWND hwndDevView, const device_config *dev, LPTSTR pszFilename, UINT nFilenameLength)
776static BOOL DevView_GetOpenFileName(HWND hwndDevView, const machine_config *config, const device_config *dev, LPTSTR pszFilename, UINT nFilenameLength)
777777{
778778   BOOL bResult;
779779   mess_image_type imagetypes[64];
780780   HWND hwndList;
781781   int gamenum;
782   machine_config *config;
783782
784783   hwndList = GetDlgItem(GetMainWindow(), IDC_LIST);
785784   gamenum = Picker_GetSelectedItem(hwndList);
786785
787   // allocate the machine config
788   config = machine_config_alloc_with_mess_devices(drivers[gamenum]);
789
790786   SetupImageTypes(config, imagetypes, sizeof(imagetypes) / sizeof(imagetypes[0]), TRUE, dev);
791   bResult = CommonFileImageDialog(last_directory, GetOpenFileName, pszFilename, imagetypes);
787   bResult = CommonFileImageDialog(last_directory, GetOpenFileName, pszFilename, config, imagetypes);
792788
793   machine_config_free(config);
794789   return bResult;
795790}
796791
797792
798793
799static BOOL DevView_GetCreateFileName(HWND hwndDevView, const device_config *dev, LPTSTR pszFilename, UINT nFilenameLength)
794static BOOL DevView_GetCreateFileName(HWND hwndDevView, const machine_config *config, const device_config *dev, LPTSTR pszFilename, UINT nFilenameLength)
800795{
801796   BOOL bResult;
802797   mess_image_type imagetypes[64];
803798   HWND hwndList;
804799   int gamenum;
805   machine_config *config;
806800
807801   hwndList = GetDlgItem(GetMainWindow(), IDC_LIST);
808802   gamenum = Picker_GetSelectedItem(hwndList);
809803
810   // allocate the machine config
811   config = machine_config_alloc_with_mess_devices(drivers[gamenum]);
812
813804   SetupImageTypes(config, imagetypes, sizeof(imagetypes) / sizeof(imagetypes[0]), TRUE, dev);
814   bResult = CommonFileImageDialog(last_directory, GetSaveFileName, pszFilename, imagetypes);
805   bResult = CommonFileImageDialog(last_directory, GetSaveFileName, pszFilename, config, imagetypes);
815806
816   machine_config_free(config);
817807   return bResult;
818808}
819809
820810
821811
822812static void DevView_SetSelectedSoftware(HWND hwndDevView, int drvindex,
823   const device_config *dev, LPCTSTR pszFilename)
813   const machine_config *config, const device_config *dev, LPCTSTR pszFilename)
824814{
825815   char* utf8_filename = utf8_from_tstring(pszFilename);
826816   if( !utf8_filename )
r2321r2322
833823
834824
835825static LPCTSTR DevView_GetSelectedSoftware(HWND hwndDevView, int nDriverIndex,
836   const device_config *dev, LPTSTR pszBuffer, UINT nBufferLength)
826   const machine_config *config, const device_config *dev, LPTSTR pszBuffer, UINT nBufferLength)
837827{
838828   LPCTSTR t_buffer = NULL;
839829   TCHAR* t_s;
840   LPCSTR s = GetSelectedSoftware(nDriverIndex, dev);
830   LPCSTR s = GetSelectedSoftware(nDriverIndex, config, dev);
841831
842832   t_s = tstring_from_utf8(s);
843833   if( !t_s )
src/mess/osd/winui/devview.c
r2321r2322
124124         pszSelection = pDevViewInfo->pCallbacks->pfnGetSelectedSoftware(
125125            hwndDevView,
126126            pDevViewInfo->nGame,
127            pDevViewInfo->config,
127128            pDevViewInfo->pEntries[i].dev,
128129            szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]));
129130
r2321r2322
148149   {
149150      pDevViewInfo->pCallbacks->pfnSetSelectedSoftware(hwndDevView,
150151         pDevViewInfo->nGame,
152         pDevViewInfo->config,
151153         pDevViewInfo->pEntries[nChangedEntry].dev,
152154         pszFilename);
153155   }
r2321r2322
217219
218220      for (dev = image_device_first(pDevViewInfo->config); dev != NULL; dev = image_device_next(dev))
219221      {
220         image_device_info info = image_device_getinfo(dev);
222         image_device_info info = image_device_getinfo(pDevViewInfo->config, dev);
221223
222224         s = tstring_from_utf8(info.name);
223225         ppszDevices[i] = alloca((_tcslen(s) + 1) * sizeof(TCHAR));
r2321r2322
253255
254256      for (dev = image_device_first(pDevViewInfo->config); dev != NULL; dev = image_device_next(dev))
255257      {
256         image_device_info info = image_device_getinfo(dev);
258         image_device_info info = image_device_getinfo(pDevViewInfo->config, dev);
257259
258260         pEnt->dev = dev;
259261
r2321r2322
329331   switch(rc)
330332   {
331333      case 1:
332         b = pDevViewInfo->pCallbacks->pfnGetOpenFileName(hwndDevView, pEnt->dev,
334         b = pDevViewInfo->pCallbacks->pfnGetOpenFileName(hwndDevView, pDevViewInfo->config, pEnt->dev,
333335            szPath, sizeof(szPath) / sizeof(szPath[0]));
334336         break;
335337      case 2:
336         b = pDevViewInfo->pCallbacks->pfnGetCreateFileName(hwndDevView, pEnt->dev,
338         b = pDevViewInfo->pCallbacks->pfnGetCreateFileName(hwndDevView, pDevViewInfo->config, pEnt->dev,
337339            szPath, sizeof(szPath) / sizeof(szPath[0]));
338340         break;
339341      case 3:
src/mess/osd/winui/msuiutil.c
r2321r2322
4949
5050   for (device = image_device_first(config); device != NULL; device = image_device_next(device))
5151   {
52      if (image_device_getinfo(device).type == type)
52      if (image_device_getinfo(config, device).type == type)
5353      {
5454         b = TRUE;
5555         break;
src/mess/osd/winui/devview.h
r2321r2322
33
44struct DevViewCallbacks
55{
6   BOOL (*pfnGetOpenFileName)(HWND hwndDevView, const device_config *dev, LPTSTR pszFilename, UINT nFilenameLength);
7   BOOL (*pfnGetCreateFileName)(HWND hwndDevView, const device_config *dev, LPTSTR pszFilename, UINT nFilenameLength);
8   void (*pfnSetSelectedSoftware)(HWND hwndDevView, int nGame, const device_config *dev, LPCTSTR pszFilename);
9   LPCTSTR (*pfnGetSelectedSoftware)(HWND hwndDevView, int nGame, const device_config *dev, LPTSTR pszBuffer, UINT nBufferLength);
6   BOOL (*pfnGetOpenFileName)(HWND hwndDevView, const machine_config *config, const device_config *dev, LPTSTR pszFilename, UINT nFilenameLength);
7   BOOL (*pfnGetCreateFileName)(HWND hwndDevView, const machine_config *config, const device_config *dev, LPTSTR pszFilename, UINT nFilenameLength);
8   void (*pfnSetSelectedSoftware)(HWND hwndDevView, int nGame, const machine_config *config, const device_config *dev, LPCTSTR pszFilename);
9   LPCTSTR (*pfnGetSelectedSoftware)(HWND hwndDevView, int nGame, const machine_config *config, const device_config *dev, LPTSTR pszBuffer, UINT nBufferLength);
1010};
1111
1212void DevView_SetCallbacks(HWND hwndDevView, const struct DevViewCallbacks *pCallbacks);
src/mess/osd/winui/softwarepicker.c
r2321r2322
185185
186186   if (device != NULL)
187187   {
188      type = image_device_getinfo(device).type;
188      type = image_device_getinfo(GetSoftwarePickerInfo(hwndPicker)->pConfig, device).type;
189189   }
190190   else
191191   {
r2321r2322
267267   unsigned int functions;
268268
269269   // get the device info
270   info = image_device_getinfo(pFileInfo->device);
270   info = image_device_getinfo(pPickerInfo->pConfig, pFileInfo->device);
271271
272272   // determine which functions to use
273273   functions = hashfile_functions_used(pPickerInfo->pHashFile, info.type);
r2321r2322
387387   // have already been calculated
388388   if ((pPickerInfo->pHashFile != NULL) && (pFileInfo->device != NULL))
389389   {
390      image_device_info info = image_device_getinfo(pFileInfo->device);
390      image_device_info info = image_device_getinfo(pPickerInfo->pConfig, pFileInfo->device);
391391      type = info.type;
392392      if (type < IO_COUNT)
393393           nHashFunctionsUsed = hashfile_functions_used(pPickerInfo->pHashFile, type);
src/mess/osd/winui/optionsms.c
r2321r2322
140140   options_set_string(MameUIGlobal(), OPTION_HASHPATH, paths, OPTION_PRIORITY_CMDLINE);
141141}
142142
143void SetSelectedSoftware(int driver_index, const device_config *dev, const char *software)
143void SetSelectedSoftware(int driver_index, const machine_config *config, const device_config *dev, const char *software)
144144{
145   image_device_info info = image_device_getinfo(dev);
145   image_device_info info = image_device_getinfo(config, dev);
146146   const char *opt_name = info.instance_name;
147147   core_options *o;
148148
r2321r2322
158158   options_free(o);
159159}
160160
161const char *GetSelectedSoftware(int driver_index, const device_config *dev)
161const char *GetSelectedSoftware(int driver_index, const machine_config *config, const device_config *dev)
162162{
163   image_device_info info = image_device_getinfo(dev);
163   image_device_info info = image_device_getinfo(config, dev);
164164   const char *opt_name = info.instance_name;
165165   const char *software;
166166   core_options *o;
src/mess/messopts.c
r2321r2322
1717
1818
1919/***************************************************************************
20    TYPE DEFINITIONS
21***************************************************************************/
22
23typedef void (*device_enum_func)(core_options *opts, const game_driver *gamedrv,
24   const machine_config *config, const device_config *device, int global_index);
25
26
27
28/***************************************************************************
2029    LOCAL VARIABLES
2130***************************************************************************/
2231
r2321r2322
4150   option, by device and index
4251-------------------------------------------------*/
4352
44const char *mess_get_device_option(const device_config *device)
53const char *mess_get_device_option(const image_device_info *info)
4554{
4655   const char *result = NULL;
47   image_device_info info;
4856
4957   if (options_get_bool(mame_options(), OPTION_ADDED_DEVICE_OPTIONS))
5058   {
51      /* get the device information */
52      info = image_device_getinfo(device);
53
5459      /* access the option */
55      result = options_get_string(mame_options(), info.instance_name);
60      result = options_get_string(mame_options(), info->instance_name);
5661   }
5762   return result;
5863}
r2321r2322
6570-------------------------------------------------*/
6671
6772static void mess_enumerate_devices(core_options *opts, const machine_config *config, const game_driver *gamedrv,
68   void (*proc)(core_options *opts, const game_driver *gamedrv, const device_config *device, int global_index))
73   device_enum_func proc)
6974{
7075   const device_config *device;
7176   int index = 0;
r2321r2322
7378   /* loop on each device instance */
7479   for (device = image_device_first(config); device != NULL; device = image_device_next(device))
7580   {
76      proc(opts, gamedrv, device, index++);
81      proc(opts, gamedrv, config, device, index++);
7782   }
7883}
7984
r2321r2322
8590-------------------------------------------------*/
8691
8792static void add_device_options_for_device(core_options *opts, const game_driver *gamedrv,
88   const device_config *device, int global_index)
93   const machine_config *config, const device_config *device, int global_index)
8994{
9095   image_device_info info;
9196   options_entry this_entry[2];
r2321r2322
101106   }
102107
103108   /* retrieve info about the device instance */
104   info = image_device_getinfo(device);
109   info = image_device_getinfo(config, device);
105110   snprintf(dev_full_name, sizeof(dev_full_name) / sizeof(dev_full_name[0]),
106111      "%s;%s", info.instance_name, info.brief_instance_name);
107112
r2321r2322
185190-------------------------------------------------*/
186191
187192static void extract_device_options_for_device(core_options *opts, const game_driver *gamedrv,
188   const device_config *device, int global_index)
193   const machine_config *config, const device_config *device, int global_index)
189194{
190195   image_device_info info;
191196   const char *filename;
r2321r2322
196201   filename = image_filename(device);
197202
198203   /* access other info */
199   info = image_device_getinfo(device);
204   info = image_device_getinfo(config, device);
200205
201206   /* and set the option */
202207   options_set_string(opts, info.instance_name, filename ? filename : "", OPTION_PRIORITY_CMDLINE);
src/mess/messopts.h
r2321r2322
3838void mess_add_device_options(core_options *opts, const game_driver *driver);
3939
4040/* accesses a device option, by device and index */
41const char *mess_get_device_option(const device_config *device);
41const char *mess_get_device_option(const image_device_info *info);
4242
4343#endif /* __MESSOPTS_H__ */

Previous 15994 Revisions Next


© 1998-2018 The MESS Team