Skip to content

Commit 1bdb2d3

Browse files
authored
Update (#138)
* Clean gitignore * Added dependencies.sh script for intsalling dependencies * Updated config.guess and config.sub + added aarch64 to aros/cpu.h * Update gitignore * Cleanup * Repo Cleanup 01 * Cleanup * Additional sagssd debug lines * Enable 32-Byte Memory Alignment * Bump version to 9.51 * sagasd 2.8
1 parent 7e18d8a commit 1bdb2d3

8 files changed

Lines changed: 33 additions & 13 deletions

File tree

arch/m68k-amiga/boot/romlog.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Idx Name Size VMA LMA File off Algn
2-
0 .rom 00078d28 00f80000 00f80000 0007c000 2**2
3-
1 .ext 0007824a 00e00000 00e00000 00002000 2**2
2+
0 .rom 0007a2a0 00f80000 00f80000 00080000 2**2
3+
1 .ext 0007d90e 00e00000 00e00000 00002000 2**2

arch/m68k-amiga/devs/sagasd/sagasd.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
##begin config
22
basename SAGASD
3-
version 2.7
3+
version 2.8
44
libbasetype struct SAGASDBase
55
sysbase_field sd_ExecBase
66
seglist_field sd_SegList

arch/m68k-amiga/devs/sagasd/sd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#define IOStdReq(io) ((struct IOStdReq *)io)
5252

5353
#if APOLLO_DEBUG
54-
#define DEBUG 1
54+
#define DEBUG 0
5555
#else
5656
#define DEBUG 0
5757
#endif

arch/m68k-amiga/timer/initcustom.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright Š 1995-2011, The AROS Development Team. All rights reserved.
2+
Copyright 1995-2011, The AROS Development Team. All rights reserved.
33
44
Desc: Detect custom chipset revisions and PAL/NTSC state
55
Lang: english
@@ -15,6 +15,7 @@
1515

1616
#include <timer_platform.h>
1717

18+
1819
static UWORD getline(void)
1920
{
2021
volatile struct Custom *custom = (struct Custom*)0xdff000;
@@ -59,11 +60,15 @@ void InitCustom(struct GfxBase *gfx)
5960

6061
while(getline() != 0);
6162
pos = gethighestline(400);
62-
if (pos > 300)
63+
if (TRUE) //(pos > 300) - [WD - TEST]
64+
{
6365
flags |= PAL;
64-
else
66+
DD(debug("PAL INIT");)
67+
} else {
6568
flags |= NTSC;
66-
69+
DD(debug("NTSC INIT");)
70+
}
71+
6772
vposr = custom->vposr & 0x7f00;
6873
if (!(vposr & 0x1000))
6974
flags |= REALLY_PAL;
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
11
#include <graphics/gfxbase.h>
2+
#include <aros/debug.h>
23

34
void InitCustom(struct GfxBase *gfx);
5+
6+
#if APOLLO_DEBUG
7+
#define DEBUG 1
8+
#else
9+
#define DEBUG 0
10+
#endif
11+
12+
#if DEBUG
13+
#define bug(x,args...) kprintf(x ,##args)
14+
#define debug(x,args...) bug("[SAGASD] %s:%ld " x "\n", __func__, (unsigned long)__LINE__ ,##args)
15+
#define DD(x) x
16+
#else
17+
#define DD(x)
18+
#endif

rom/devs/ata/ata.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -590,15 +590,15 @@ static void cmd_AddChangeInt(struct IORequest *io, LIBBASETYPEPTR LIBBASE)
590590

591591
D(bug("[ATA%02ld] %s()\n", ((struct ata_Unit*)io->io_Unit)->au_UnitNum, __func__));
592592

593-
//Forbid();
593+
Forbid();
594594
AddHead(&unit->au_SoftList, (struct Node *)io);
595-
//Permit();
595+
Permit();
596596

597597
struct IORequest *msg;
598598

599599
ForeachNode(&unit->au_SoftList, msg)
600600
{
601-
D(bug("Handler Entry added in unit->au_SoftList: handler = %x | unit = %d\n", (struct Interrupt *)IOStdReq(msg)->io_Data, unit->au_UnitNum));
601+
D(bug("[ATA%02ld] : Handler Entry added in unit->au_SoftList: handler = %x | unit = %d\n", ((struct ata_Unit*)io->io_Unit)->au_UnitNum, (struct Interrupt *)IOStdReq(msg)->io_Data, unit->au_UnitNum));
602602
}
603603

604604
io->io_Flags &= ~IOF_QUICK;

rom/filesys/fat/fat_fs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#define FAT_HANDLER_H
1515

1616
#if APOLLO_DEBUG
17-
#define DEBUG 1
17+
#define DEBUG 0
1818
#else
1919
#define DEBUG 0
2020
#endif

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Release 9.5
1+
Release 9.51

0 commit comments

Comments
 (0)