Merge pull request #868 from uyjulian/rom0_info_use_iopheap

Use iopheap functions for rom0_info

Author: fjtrujy

ee/kernel/Makefile

@@ -86,26 +86,26 @@ GLUE_OBJS += SyncDCache.o iSyncDCache.o InvalidDCache.o iInvalidDCache.o
 SIO_OBJS = sio_init.o sio_putc.o sio_getc.o sio_write.o sio_read.o sio_puts.o \
 	sio_gets.o sio_getc_block.o sio_flush.o sio_putsn.o
 
-ROM0_OBJS = _info_internals.o GetRomNameWithIODriver.o GetRomName.o IsDESRMachineWithIODriver.o IsDESRMachine.o IsT10KWithIODriver.o IsT10K.o
+ROM0_OBJS = _info_internals.o SetupRomInfo.o GetRomName.o IsDESRMachine.o IsT10K.o
 
 ### Config objects
 
 CONFIG_OBJS = _config_internals.o converttobcd.o convertfrombcd.o __adjustTime.o IsEarlyJap.o \
-	configGetLanguageWithIODriver.o configGetLanguage.o \
-	configSetLanguageWithIODriver.o configSetLanguage.o \
-	configGetTvScreenTypeWithIODriver.o configGetTvScreenType.o \
-	configSetTvScreenTypeWithIODriver.o configSetTvScreenType.o \
-	configGetDateFormatWithIODriver.o configGetDateFormat.o \
-	configSetDateFormatWithIODriver.o configSetDateFormat.o \
-	configGetTimeFormatWithIODriver.o configGetTimeFormat.o \
-	configSetTimeFormatWithIODriver.o configSetTimeFormat.o \
-	configGetTimezoneWithIODriver.o configGetTimezone.o \
-	configSetTimezoneWithIODriver.o configSetTimezone.o \
-	configIsSpdifEnabledWithIODriver.o configIsSpdifEnabled.o \
-	configSetSpdifEnabledWithIODriver.o configSetSpdifEnabled.o \
-	configIsDaylightSavingEnabledWithIODriver.o configIsDaylightSavingEnabled.o \
-	configSetDaylightSavingEnabledWithIODriver.o configSetDaylightSavingEnabled.o \
-	configConvertToGmtTime.o configConvertToLocalTimeWithIODriver.o configConvertToLocalTime.o
+	configGetLanguage.o \
+	configSetLanguage.o \
+	configGetTvScreenType.o \
+	configSetTvScreenType.o \
+	configGetDateFormat.o \
+	configSetDateFormat.o \
+	configGetTimeFormat.o \
+	configSetTimeFormat.o \
+	configGetTimezone.o \
+	configSetTimezone.o \
+	configIsSpdifEnabled.o \
+	configSetSpdifEnabled.o \
+	configIsDaylightSavingEnabled.o \
+	configSetDaylightSavingEnabled.o \
+	configConvertToGmtTime.o configConvertToLocalTime.o
 
 ### Patch objects
 

ee/kernel/include/osd_config.h

@@ -129,95 +129,99 @@ extern "C" {
  * @return Language value (See OSD_LANGUAGES above)
  */
 extern int configGetLanguage(void);
-extern int configGetLanguageWithIODriver(_io_driver *driver);
+static inline int configGetLanguageWithIODriver(const _io_driver *driver) { return configGetLanguage(); }
 
 /** sets the default language of the ps2
  * @param language Language value (See OSD_LANGUAGES above)
  */
 extern void configSetLanguage(int language);
-extern void configSetLanguageWithIODriver(int language, _io_driver *driver);
-
+static inline void configSetLanguageWithIODriver(int language, const _io_driver *driver) { configSetLanguage(language); }
 
 /** get the tv screen type the ps2 is setup for
  * @return 0 = 4:3; 1 = fullscreen; 2 = 16:9
  */
 extern int configGetTvScreenType(void);
-extern int configGetTvScreenTypeWithIODriver(_io_driver *driver);
+static inline int configGetTvScreenTypeWithIODriver(const _io_driver *driver) { return configGetTvScreenType(); }
 
 /** set the tv screen type
  * @param screenType 0 = 4:3; 1 = fullscreen; 2 = 16:9
  */
 extern void configSetTvScreenType(int screenType);
-extern void configSetTvScreenTypeWithIODriver(int screenType, _io_driver *driver);
+static inline void configSetTvScreenTypeWithIODriver(int screenType, const _io_driver *driver) { configSetTvScreenType(screenType); }
 
 /** gets the date display format
  * @return 0 = yyyy/mm/dd; 1 = mm/dd/yyyy; 2 = dd/mm/yyyy
  */
 extern int configGetDateFormat(void);
-extern int configGetDateFormatWithIODriver(_io_driver *driver);
+static inline int configGetDateFormatWithIODriver(const _io_driver *driver) { return configGetDateFormat(); }
 
 /** sets the date display format
  * @param dateFormat 0 = yyyy/mm/dd; 1 = mm/dd/yyyy; 2 = dd/mm/yyyy
  */
 extern void configSetDateFormat(int dateFormat);
-extern void configSetDateFormatWithIODriver(int dateFormat, _io_driver *driver);
+static inline void configSetDateFormatWithIODriver(int dateFormat, const _io_driver *driver) { configSetDateFormat(dateFormat); }
 
 /** gets the time display format
  * (whether 24hour time or not)
  * @return 0 = 24hour; 1 = 12hour
  */
 extern int configGetTimeFormat(void);
-extern int configGetTimeFormatWithIODriver(_io_driver *driver);
+static inline int configGetTimeFormatWithIODriver(const _io_driver *driver) { return configGetTimeFormat(); }
 
 /** sets the time display format
  * (whether 24hour time or not)
  * @param timeFormat 0 = 24hour; 1 = 12hour
  */
 extern void configSetTimeFormat(int timeFormat);
-extern void configSetTimeFormatWithIODriver(int timeFormat, _io_driver *driver);
+static inline void configSetTimeFormatWithIODriver(int timeFormat, const _io_driver *driver) { configSetTimeFormat(timeFormat); }
 
 /** get timezone
  * @return offset in minutes from GMT
  */
 extern int configGetTimezone(void);
-extern int configGetTimezoneWithIODriver(_io_driver *driver);
+static inline int configGetTimezoneWithIODriver(const _io_driver *driver) { return configGetTimezone(); }
 
 /** set timezone
  * @param offset offset in minutes from GMT
  */
 extern void configSetTimezone(int offset);
-extern void configSetTimezoneWithIODriver(int timezoneOffset, _io_driver *driver, void (*finishedCallback)(void));
+static inline void configSetTimezoneWithIODriver(int offset, const _io_driver *driver, void *finishedCallback) { configSetTimezone(offset); }
 
 /** checks whether the spdif is enabled or not
  * @return 1 = on; 0 = off
  */
 extern int configIsSpdifEnabled(void);
-extern int configIsSpdifEnabledWithIODriver(_io_driver *driver);
+static inline int configIsSpdifEnabledWithIODriver(const _io_driver *driver) { return configIsSpdifEnabled(); }
 
 /** sets whether the spdif is enabled or not
  * @param enabled 1 = on; 0 = off
  */
 extern void configSetSpdifEnabled(int enabled);
-extern void configSetSpdifEnabledWithIODriver(int enabled, _io_driver *driver);
+static inline void configSetSpdifEnabledWithIODriver(int enabled, const _io_driver *driver) { configSetSpdifEnabled(enabled); }
 
 /** checks whether daylight saving is currently set
  * @return 1 = on; 0 = off
  */
 extern int configIsDaylightSavingEnabled(void);
-extern int configIsDaylightSavingEnabledWithIODriver(_io_driver *driver);
+static inline int configIsDaylightSavingEnabledWithIODriver(const _io_driver *driver) { return configIsDaylightSavingEnabled(); }
 
 /** sets daylight saving
  * @param enabled 1 = on; 0 = off
  */
 extern void configSetDaylightSavingEnabled(int enabled);
-extern void configSetDaylightSavingEnabledWithIODriver(int daylightSaving, _io_driver *driver, void (*finishedCallback)(void));
+static inline void configSetDaylightSavingEnabledWithIODriver(int enabled, const _io_driver *driver, void *finishedCallback) { configSetDaylightSavingEnabled(enabled); }
 
 #ifndef OSD_CONFIG_NO_LIBCDVD
 /** converts the time returned from the ps2's clock into GMT time
  * (ps2 clock is in JST time)
  */
 extern void configConvertToGmtTime(sceCdCLOCK *time);
-extern void configConvertToLocalTimeWithIODriver(sceCdCLOCK *time, _io_driver *driver);
+
+/** converts the time returned from the ps2's clock into local time
+ * (ps2 clock is in JST time)
+ */
+extern void configConvertToLocalTime(sceCdCLOCK *time);
+static inline void configConvertToLocalTimeWithIODriver(sceCdCLOCK *time, const _io_driver *driver) { configConvertToLocalTime(time); }
 #endif
 
 // Internal functions.

ee/kernel/include/rom0_info.h

@@ -28,19 +28,21 @@ typedef struct {
     int openFlags;
 } _io_driver;
 
+extern void SetupRomInfo(void);
+
 /** check whether the PlayStation 2 is actually a DESR-XXXX machine
  *
  * @return 1 if DESR-XXXX machine; 0 if not
  */
 extern int IsDESRMachine(void);
-extern int IsDESRMachineWithIODriver(_io_driver *driver);
+static inline int IsDESRMachineWithIODriver(const _io_driver *driver) { return IsDESRMachine(); }
 
 /** check whether the PlayStation 2 is actually a TOOL DTL-T10000(H)
  *
  * @return 1 if DTL-T10000(H); 0 if not
  */
 extern int IsT10K(void);
-extern int IsT10KWithIODriver(_io_driver *driver);
+static inline int IsT10KWithIODriver(const _io_driver *driver) { return IsT10K(); }
 
 /** gets the romname from the current ps2
  * 14 chars - doesnt set a null terminator
@@ -49,7 +51,7 @@ extern int IsT10KWithIODriver(_io_driver *driver);
  * @return pointer to buffer containing romname
  */
 extern char *GetRomName(char *romname);
-extern char *GetRomNameWithIODriver(char *romname, _io_driver *driver);
+static inline char *GetRomNameWithIODriver(char *romname, const _io_driver *driver) { return GetRomName(romname); }
 
 #ifdef __cplusplus
 }