gwj / at91sam9263 · Commits

Commit 9b5953952aa41a54e26cba8888c7830f4bd90d53

Authored by aurel32
1 parent 15a51156

Fix mipsnet device ID, noticed by Vijay Kumar. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4119 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 2 additions and 4 deletions
hw/mipsnet.c
  View file @9b59539
... ... @@ -11,7 +11,6 @@
11 11 /* MIPSnet register offsets */
12 12  
13 13 #define MIPSNET_DEV_ID 0x00
14   -# define MIPSNET_DEV_ID_STRING "MIPSNET0"
15 14 #define MIPSNET_BUSY 0x08
16 15 #define MIPSNET_RX_DATA_COUNT 0x0c
17 16 #define MIPSNET_TX_DATA_COUNT 0x10
... ... @@ -105,15 +104,14 @@ static uint32_t mipsnet_ioport_read(void *opaque, uint32_t addr)
105 104 {
106 105 MIPSnetState *s = opaque;
107 106 int ret = 0;
108   - const char *devid = MIPSNET_DEV_ID_STRING;
109 107  
110 108 addr &= 0x3f;
111 109 switch (addr) {
112 110 case MIPSNET_DEV_ID:
113   - ret = *((uint32_t *)&devid);
  111 + ret = be32_to_cpu(0x4d495053); /* MIPS */
114 112 break;
115 113 case MIPSNET_DEV_ID + 4:
116   - ret = *((uint32_t *)(&devid + 4));
  114 + ret = be32_to_cpu(0x4e455430); /* NET0 */
117 115 break;
118 116 case MIPSNET_BUSY:
119 117 ret = s->busy;
... ...