420 |
|
|
421 |
|
} else if (type == FOURCC('n','s','r','d') && id == 1) { |
422 |
|
D(bug("nsrd 1 found\n")); |
423 |
< |
if (p[(0x378 + 0x570) >> 1] == 0x7c08 && p[(0x37a + 0x570) >> 1] == 0x02a6) { |
423 |
> |
if (p[(0x378 + 0x570) >> 1] == htons(0x7c08) && p[(0x37a + 0x570) >> 1] == htons(0x02a6)) { |
424 |
|
// Don't overwrite our serial drivers (8.0, 8.1) |
425 |
< |
p[(0x378 + 0x570) >> 1] = 0x4e80; // blr |
426 |
< |
p[(0x37a + 0x570) >> 1] = 0x0020; |
425 |
> |
p[(0x378 + 0x570) >> 1] = htons(0x4e80); // blr |
426 |
> |
p[(0x37a + 0x570) >> 1] = htons(0x0020); |
427 |
|
D(bug(" patch 1 applied\n")); |
428 |
< |
} else if (p[(0x378 + 0x6c0) >> 1] == 0x7c08 && p[(0x37a + 0x6c0) >> 1] == 0x02a6) { |
428 |
> |
} else if (p[(0x378 + 0x6c0) >> 1] == htons(0x7c08) && p[(0x37a + 0x6c0) >> 1] == htons(0x02a6)) { |
429 |
|
// Don't overwrite our serial drivers (8.5, 8.6) |
430 |
< |
p[(0x378 + 0x6c0) >> 1] = 0x4e80; // blr |
431 |
< |
p[(0x37a + 0x6c0) >> 1] = 0x0020; |
430 |
> |
p[(0x378 + 0x6c0) >> 1] = htons(0x4e80); // blr |
431 |
> |
p[(0x37a + 0x6c0) >> 1] = htons(0x0020); |
432 |
|
D(bug(" patch 2 applied\n")); |
433 |
|
} |
434 |
|
|
438 |
|
while (size--) { |
439 |
|
if (PM(0,0x203c) && PM(1,0x0100) && PM(2,0x0000) && PM(3,0xc0ae) && PM(4,0xfffc)) { |
440 |
|
// Don't replace SCSI Manager (8.1, 8.5, 8.6) |
441 |
< |
p[5] = htons((p[5] & 0xff) | 0x6000); // beq |
441 |
> |
p[5] = htons((ntohs(p[5]) & 0xff) | 0x6000); // beq |
442 |
|
D(bug(" patch 1 applied\n")); |
443 |
|
break; |
444 |
|
} |
447 |
|
|
448 |
|
} else if (type == FOURCC('t','h','n','g')) { |
449 |
|
// Collect info about used audio sifters |
450 |
< |
uint32 c_type = 0[(uint32 *)p]; |
451 |
< |
uint32 sub_type = 1[(uint32 *)p]; |
450 |
> |
uint32 c_type = ntohl(0[(uint32 *)p]); |
451 |
> |
uint32 sub_type = ntohl(1[(uint32 *)p]); |
452 |
|
if (c_type == FOURCC('s','d','e','v') && sub_type == FOURCC('s','i','n','g')) { |
453 |
< |
1[(uint32 *)p] = FOURCC('a','w','g','c'); |
453 |
> |
1[(uint32 *)p] = htonl(FOURCC('a','w','g','c')); |
454 |
|
D(bug("thng %d, type %c%c%c%c (%08x), sub type %c%c%c%c (%08x), data %p\n", id, c_type >> 24, (c_type >> 16) & 0xff, (c_type >> 8) & 0xff, c_type & 0xff, c_type, sub_type >> 24, (sub_type >> 16) & 0xff, (sub_type >> 8) & 0xff, sub_type & 0xff, sub_type, p)); |
455 |
< |
AddSifter(*(uint32 *)(((uintptr)p)+20), p[12]); |
456 |
< |
if (p[28]) // componentPFCount |
457 |
< |
AddSifter(*(uint32 *)(((uintptr)p)+62), p[33]); |
455 |
> |
AddSifter(ReadMacInt32(((uintptr)p)+20), ntohs(p[12])); |
456 |
> |
if (ntohs(p[28])) // componentPFCount |
457 |
> |
AddSifter(ReadMacInt32(((uintptr)p)+62), ntohs(p[33])); |
458 |
|
} |
459 |
|
|
460 |
|
} else if (type == FOURCC('s','i','f','t') || type == FOURCC('n','i','f','t')) { |