Added FW and CORE Versions on Samples

Author: crystalct

Makefile

@@ -129,6 +129,8 @@ rsxsample:
 	@$(MAKE) -C rsx_sample --no-print-directory
 
 #---------------------------------------------------------------------------------
+pkg:	$(BUILD) $(OUTPUT).pkg
+
 else
 
 DEPENDS	:=	$(OFILES:.o=.d)

include/ps3mapidyn.h

@@ -108,7 +108,11 @@ int ps3mapi_process_page_free(process_id_t pid, uint64_t flags, uint64_t *page_t
 
 int ps3mapi_get_core_version(void)
 {
+#ifdef __PSL1GHT__
 	lv2syscall2(8, SYSCALL8_OPCODE_PS3MAPI, PS3MAPI_OPCODE_GET_CORE_VERSION);
+#else
+	system_call_2((uint64_t)8,(uint64_t)SYSCALL8_OPCODE_PS3MAPI, (uint64_t)PS3MAPI_OPCODE_GET_CORE_VERSION);
+#endif
 	return_to_user_prog(int);						
 }
 
@@ -117,6 +121,16 @@ int has_ps3mapi(void)
 	return (ps3mapi_get_core_version() >= PS3MAPI_CORE_MINVERSION);
 }
 
+int ps3mapi_get_fw_version(void)
+{
+#ifdef __PSL1GHT__
+	lv2syscall2(8, SYSCALL8_OPCODE_PS3MAPI, PS3MAPI_OPCODE_GET_FW_VERSION);
+#else
+	system_call_2((uint64_t)8,(uint64_t)SYSCALL8_OPCODE_PS3MAPI, (uint64_t)PS3MAPI_OPCODE_GET_FW_VERSION);
+#endif
+	return_to_user_prog(int);						
+}
+
 
 int ps3mapi_set_process_mem(process_id_t pid, uint64_t addr, char *buf, int size )
 {

psgl_sample/source/main.cpp

@@ -251,11 +251,14 @@ int main()
 
 			// Prepare screen_buffer_out for DebugFont
 			sprintf(screen_buffer_out, "\n\nPS3 MAPI DYNAREC TEST (PSGL VERSION)\n\n"
+				"\nPS3 MAPI CORE VERSION: %d\n"
+				"\nPS3 MAPI FW VERSION: %d\n"
 				"\nPROCESS PID: %d"
 				"\nDYNAREC BYTECODE BUFFER AT: 0x%llx "
 				"\nLENGTH DYNAREC BYTECODE BUFFER: %d bytes"
 				"\nRESULT FIRST FUNCTION CALL: %d (%s)"
 				"\nRESULT SECOND FUNCYION CALL: %d (%s)",
+				ps3mapi_get_core_minversion(), ps3mapi_get_fw_version(),
 				sysProcessGetPid(), (uint64_t)START_DYNAREC_BUFFER, LEN_DYNAREC_BUFFER,
 				result1, result1 == 5 ? "SUCCESS" : "FAIL", result2, result2 == 9 ? "SUCCESS" : "FAIL");
 		}

rsx_sample/source/main.cpp

@@ -219,11 +219,14 @@ int main(int argc,const char *argv[])
 
 		// Prepare screen_buffer_out for DebugFont
 		sprintf(screen_buffer_out, "\n\nPS3 MAPI DYNAREC TEST\n\n"
+					"\nPS3 MAPI CORE VERSION: %d\n"
+					"\nPS3 MAPI FW VERSION: %d\n"
 					"\nPROCESS PID: %d\n"
 					"\nDYNAREC BYTECODE BUFFER AT: 0x%lx "
 					"\nLENGTH DYNAREC BYTECODE BUFFER: %d bytes"
 					"\nRESULT FIRST FUNCTION CALL: %d (%s)"
 					"\nRESULT SECOND FUNCTION CALL: %d (%s)",
+					ps3mapi_get_core_minversion(), ps3mapi_get_fw_version(),
 					sysProcessGetPid(), (uint64_t)START_DYNAREC_BUFFER, LEN_DYNAREC_BUFFER, 
 					result1, result1 == 5 ? "SUCCESS": "FAIL", result2, result2 == 9 ? "SUCCESS": "FAIL");
 	}