r2357 - in trunk/src/host/qemu-neo1973: gnokiigsm target-arm
andrew at sita.openmoko.org
andrew at sita.openmoko.org
Mon Jul 2 22:51:17 CEST 2007
Author: andrew
Date: 2007-07-02 22:51:15 +0200 (Mon, 02 Jul 2007)
New Revision: 2357
Modified:
trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.c
trunk/src/host/qemu-neo1973/target-arm/cpu.h
trunk/src/host/qemu-neo1973/target-arm/helper.c
Log:
Set default ARM System Config reset value.
Report correct caller numbers.
Modified: trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.c
===================================================================
--- trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.c 2007-07-02 20:43:42 UTC (rev 2356)
+++ trunk/src/host/qemu-neo1973/gnokiigsm/at-emulator.c 2007-07-02 20:51:15 UTC (rev 2357)
@@ -219,8 +219,8 @@
switch (CallStatus) {
case GN_CALL_Incoming:
+ IncomingCallNo = CallInfo->call_id;
gn_atem_modem_result(MR_RING);
- IncomingCallNo = CallInfo->call_id;
ModemRegisters[REG_RINGCNT]++;
gn_atem_cid_out(CallInfo);
if (ModemRegisters[REG_RINGATA] != 0) gn_atem_answer_phone();
@@ -859,7 +859,7 @@
/* Format: %CPI: <cId>,<msgType>,<ibt>,<tch>,<dir>,[<mode>],
* [<number>],[<type>],[<alpha>],[<cause>],<line> */
asprintf(&buffer, "%%CPI: %i,%i,0,%i,%i,0,,,,,0\r\n",
- data.call_info->call_id, msg, inband, dir);
+ IncomingCallNo, msg, inband, dir);
gn_atem_string_out(buffer);
free(buffer);
}
Modified: trunk/src/host/qemu-neo1973/target-arm/cpu.h
===================================================================
--- trunk/src/host/qemu-neo1973/target-arm/cpu.h 2007-07-02 20:43:42 UTC (rev 2356)
+++ trunk/src/host/qemu-neo1973/target-arm/cpu.h 2007-07-02 20:51:15 UTC (rev 2357)
@@ -285,7 +285,7 @@
#else
/* The ARM MMU allows 1k pages. */
/* ??? Linux doesn't actually use these, and they're deprecated in recent
- architecture revisions. Maybe an a configure option to disable them. */
+ architecture revisions. Maybe a configure option to disable them. */
#define TARGET_PAGE_BITS 10
#endif
Modified: trunk/src/host/qemu-neo1973/target-arm/helper.c
===================================================================
--- trunk/src/host/qemu-neo1973/target-arm/helper.c 2007-07-02 20:43:42 UTC (rev 2356)
+++ trunk/src/host/qemu-neo1973/target-arm/helper.c 2007-07-02 20:51:15 UTC (rev 2357)
@@ -17,6 +17,7 @@
case ARM_CPUID_ARM920T:
set_feature(env, ARM_FEATURE_S3C);
env->cp15.c0_cachetype = 0xd172172;
+ env->cp15.c1_sys = 0x00000078;
break;
case ARM_CPUID_ARM926:
set_feature(env, ARM_FEATURE_VFP);
More information about the commitlog
mailing list