github
/
AROS-v0
mirror of https://github.com/deadw00d/AROS.git
1
0
Fork 0
Code Issues Releases Wiki Activity

64bit corrections.

This commit is contained in:
Kalamatee 2023-04-14 23:16:18 +01:00 committed by deadwood
parent c6f4d2282c
commit e96bf57cae
16 changed files with 72 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
workbench/devs/AHI/AHI-Handler/aros/resident.c
View File

@ -41,6 +41,9 @@ __section(".text.romtag") struct Resident const ROMTag =
(CONST_STRPTR)&LibName[0],
(CONST_STRPTR)&ID[6],
(APTR)InitLib
#if defined(__AROS__)
, 0, NULL
#endif
};
__section(".text.romtag") const char LibName[] = "AHI-Handler";

2
workbench/devs/AHI/AHI-Handler/version.date
View File

@ -1 +1 @@
28.09.05
14.04.2023

2
workbench/devs/AHI/AHI-Handler/version.rev
View File

@ -1 +1 @@
2
3

14
workbench/devs/AHI/AHI/ahi.c
View File

@ -1,6 +1,6 @@
/*
AHI - The AHI preferences program
Copyright (C) 2017 The AROS Dev Team
Copyright (C) 2017-2023 The AROS Dev Team
Copyright (C) 1996-2005 Martin Blom <martin@blom.org>
This program is free software; you can redistribute it and/or
@ -123,7 +123,7 @@ int main(int argc, char **argv) {
s = (char *) FindToolType(toolarray,"PUBSCREEN");
if( s != NULL ) {
strncpy(pubscreen, s, sizeof pubscreen);
strncpy(pubscreen, s, sizeof(pubscreen) - 1);
args.pubscreen = pubscreen;
}
@ -292,7 +292,7 @@ void NewMode(int selectedmode) {
if( mode != NULL )
{
D(bug("[AHI:Prefs] %s: Mode %08x\n", __func__, mode);)
D(bug("[AHI:Prefs] %s: Mode @ 0x%p\n", __func__, mode);)
id = mode->ID;
@ -463,7 +463,7 @@ void FillUnit() {
unit->prefs.ahiup_Channels = 0;
}
if( state.ModeSelected != ~0 )
if( state.ModeSelected != ~0UL)
{
mode = (struct ModeNode *) GetNode(state.ModeSelected, ModeList);
}
@ -511,7 +511,7 @@ char *getFreq(void) {
D(bug("[AHI:Prefs] %s()\n", __func__);)
if( state.ModeSelected != ~0 )
if( state.ModeSelected != ~0UL )
{
mode = (struct ModeNode *) GetNode(state.ModeSelected, ModeList);
} else {
@ -616,7 +616,7 @@ IPTR getAudioMode(void) {
D(bug("[AHI:Prefs] %s()\n", __func__);)
if( state.ModeSelected == ~0 )
if( state.ModeSelected == ~0UL )
{
return AHI_INVALID_ID;
}
@ -637,7 +637,7 @@ char *getRecord(void) {
D(bug("[AHI:Prefs] %s()\n", __func__);)
if( state.ModeSelected != ~0 )
if( state.ModeSelected != ~0UL )
{
mode = (struct ModeNode *) GetNode(state.ModeSelected, ModeList);
}

6
workbench/devs/AHI/AHI/gui_mui.c
View File

@ -1,6 +1,6 @@
/*
AHI - The AHI preferences program
Copyright (C) 2017 The AROS Dev Team
Copyright (C) 2017-2023 The AROS Dev Team
Copyright (C) 1996-2005 Martin Blom <martin@blom.org>
This program is free software; you can redistribute it and/or
@ -307,13 +307,13 @@ static void GUINewUnit(void)
set(MUIList, MUIA_List_Quiet, TRUE);
DoMethod(MUIList, MUIM_List_Insert, Modes, -1, MUIV_List_Insert_Bottom);
set(MUIList, MUIA_List_Quiet, FALSE);
set(MUIList, MUIA_List_Active, state.ModeSelected != ~0 ? state.ModeSelected : MUIV_List_Active_Off);
set(MUIList, MUIA_List_Active, state.ModeSelected != ~0UL ? state.ModeSelected : (IPTR)MUIV_List_Active_Off);
GUINewMode();
}
static void GUINewMode(void)
{
int Max, Sel, Dis;
IPTR Max, Sel, Dis;
char* buffer;
char* arg1 = getRecord();
char* arg2 = getAuthor();

2
workbench/devs/AHI/AHI/version.date
View File

@ -1 +1 @@
18.03.2017
14.04.2023

2
workbench/devs/AHI/AHI/version.rev
View File

@ -1 +1 @@
4
5

24
workbench/devs/AHI/Device/audioctrl.c
View File

@ -1,6 +1,6 @@
/*
AHI - Hardware independent audio subsystem
Copyright (C) 2017 The AROS Dev Team
Copyright (C) 2017-2023 The AROS Dev Team
Copyright (C) 1996-2005 Martin Blom <martin@blom.org>
This library is free software; you can redistribute it and/or
@ -173,13 +173,13 @@ CreateAudioCtrl(struct TagItem *tags)
audioctrl->ac.ahiac_AudioCtrl.ahiac_UserData =
(APTR)GetTagData(AHIA_UserData,0,tags);
audioctrl->ahiac_AudioID =
GetTagData(AHIA_AudioID,AHI_DEFAULT_ID,tags);
(ULONG)GetTagData(AHIA_AudioID,AHI_DEFAULT_ID,tags);
audioctrl->ac.ahiac_MixFreq =
GetTagData(AHIA_MixFreq,AHI_DEFAULT_FREQ,tags);
(ULONG)GetTagData(AHIA_MixFreq,AHI_DEFAULT_FREQ,tags);
audioctrl->ac.ahiac_Channels =
GetTagData(AHIA_Channels,0,tags);
(UWORD)GetTagData(AHIA_Channels,0,tags);
audioctrl->ac.ahiac_Sounds =
GetTagData(AHIA_Sounds,0,tags);
(UWORD)GetTagData(AHIA_Sounds,0,tags);
audioctrl->ac.ahiac_SoundFunc =
(struct Hook *)GetTagData(AHIA_SoundFunc,0,tags);
audioctrl->ahiac_RecordFunc =
@ -187,13 +187,13 @@ CreateAudioCtrl(struct TagItem *tags)
audioctrl->ac.ahiac_PlayerFunc =
(struct Hook *)GetTagData(AHIA_PlayerFunc,0,tags);
audioctrl->ac.ahiac_PlayerFreq =
GetTagData(AHIA_PlayerFreq,0,tags);
(Fixed)GetTagData(AHIA_PlayerFreq,0,tags);
audioctrl->ac.ahiac_MinPlayerFreq =
GetTagData(AHIA_MinPlayerFreq,0,tags);
(Fixed)GetTagData(AHIA_MinPlayerFreq,0,tags);
audioctrl->ac.ahiac_MaxPlayerFreq =
GetTagData(AHIA_MaxPlayerFreq,0,tags);
(Fixed)GetTagData(AHIA_MaxPlayerFreq,0,tags);
audioctrl->ac.ahiac_AntiClickSamples =
GetTagData(AHIA_AntiClickSamples,~0,tags);
(ULONG)GetTagData(AHIA_AntiClickSamples,~0UL,tags);
audioctrl->ahiac_MasterVolume=0x00010000;
audioctrl->ahiac_SetMasterVolume=0x00010000;
@ -222,7 +222,7 @@ CreateAudioCtrl(struct TagItem *tags)
if(audioctrl->ac.ahiac_MaxPlayerFreq < 65536)
audioctrl->ac.ahiac_MaxPlayerFreq <<= 16;
if(audioctrl->ac.ahiac_AntiClickSamples == ~0)
if(audioctrl->ac.ahiac_AntiClickSamples == 0xFFFFFFFF)
audioctrl->ac.ahiac_AntiClickSamples =
( AHIBase->ahib_AntiClickTime * audioctrl->ac.ahiac_MixFreq ) >> 16;
@ -628,8 +628,8 @@ _AHI_AllocAudioA( struct TagItem* tags,
audioctrl->ahiac_MaxCPU = AHIBase->ahib_MaxCPU >> 8;
}
audioctrl->ac.ahiac_PreTimer = (BOOL (*)(void)) PreTimerPreserveAllRegs;
audioctrl->ac.ahiac_PostTimer = (void (*)(void)) PostTimerPreserveAllRegs;
audioctrl->ac.ahiac_PreTimer = (AHIPreTimerHook) PreTimerPreserveAllRegs;
audioctrl->ac.ahiac_PostTimer = (AHIPostTimerHook) PostTimerPreserveAllRegs;
audioctrl->ac.ahiac_PreTimerFunc=AllocVec(sizeof(struct Hook),MEMF_PUBLIC|MEMF_CLEAR);
if(!audioctrl->ac.ahiac_PreTimerFunc)

12
workbench/devs/AHI/Device/device.c
View File

@ -1,6 +1,6 @@
/*
AHI - Hardware independent audio subsystem
Copyright (C) 2017 The AROS Dev Team
Copyright (C) 2017-2023 The AROS Dev Team
Copyright (C) 1996-2005 Martin Blom <martin@blom.org>
This library is free software; you can redistribute it and/or
@ -826,19 +826,19 @@ AllocHardware ( struct AHIDevUnit *iounit,
/* Set hardware properties */
AHI_ControlAudio(iounit->AudioCtrl,
(iounit->MonitorVolume == ~0 ? TAG_IGNORE : AHIC_MonitorVolume),
((LONG)iounit->MonitorVolume == ~0L ? TAG_IGNORE : AHIC_MonitorVolume),
iounit->MonitorVolume,
(iounit->InputGain == ~0 ? TAG_IGNORE : AHIC_InputGain),
((LONG)iounit->InputGain == ~0L ? TAG_IGNORE : AHIC_InputGain),
iounit->InputGain,
(iounit->OutputVolume == ~0 ? TAG_IGNORE : AHIC_OutputVolume),
((ULONG)iounit->OutputVolume == ~0UL ? TAG_IGNORE : AHIC_OutputVolume),
iounit->OutputVolume,
(iounit->Input == ~0 ? TAG_IGNORE : AHIC_Input),
((ULONG)iounit->Input == ~0UL ? TAG_IGNORE : AHIC_Input),
iounit->Input,
(iounit->Output == ~0 ? TAG_IGNORE : AHIC_Output),
((ULONG)iounit->Output == ~0UL ? TAG_IGNORE : AHIC_Output),
iounit->Output,
TAG_DONE);

11
workbench/devs/AHI/Device/gateway.h
View File

@ -29,11 +29,8 @@ void m68k_DevProc( void );
#if defined( __AROS__ ) && !defined( __mc68000__ )
BOOL
m68k_PreTimer( void );
void
m68k_PostTimer( void );
BOOL m68k_PreTimer( void *);
void m68k_PostTimer( void *);
#define HookEntryPreserveAllRegs HookEntry
#define PreTimerPreserveAllRegs m68k_PreTimer
@ -45,8 +42,8 @@ m68k_PostTimer( void );
void HookEntryPreserveAllRegs( void );
/* (Pre|Post)Timer entry points */
void PreTimerPreserveAllRegs( void );
void PostTimerPreserveAllRegs( void );
BOOL PreTimerPreserveAllRegs( void * );
void PostTimerPreserveAllRegs( void * );
#endif /* defined( __AROS__ ) && !defined( __mc68000__ ) */

8
workbench/devs/AHI/Device/sound.c
View File

@ -1,6 +1,6 @@
/*
AHI - Hardware independent audio subsystem
Copyright (C) 2017 The AROS Dev Team
Copyright (C) 2017-2023 The AROS Dev Team
Copyright (C) 1996-2005 Martin Blom <martin@blom.org>
This library is free software; you can redistribute it and/or
@ -949,11 +949,7 @@ _AHI_LoadSound( UWORD sound,
rc = AHIE_BADSAMPLETYPE;
break;
}
else
{
// Fall through ...
}
// fall through
case AHIST_M8S:
case AHIST_M16S:
case AHIST_S8S:

2
workbench/devs/AHI/Device/version.date
View File

@ -1 +1 @@
18.03.2017
14.04.2023

2
workbench/devs/AHI/Device/version.rev
View File

@ -1 +1 @@
8
9

51
workbench/devs/AHI/Include/C/libraries/ahi_sub.h
View File

@ -2,7 +2,7 @@
#define LIBRARIES_AHISUB_H
/*
** $VER: ahi_sub.h 6.0 (02.02.2005)
** $VER: ahi_sub.h 6.1 (14.04.2023)
** :ts=8 (TAB SIZE: 8)
**
** ahi/[driver].audio definitions
@ -35,35 +35,38 @@
/*** STRUCTURES */
typedef BOOL (*AHIPreTimerHook)(void *);
typedef void (*AHIPostTimerHook)(void *);
/* AHIAudioCtrlDrv */
struct AHIAudioCtrlDrv
{
struct AHIAudioCtrl ahiac_AudioCtrl;
ULONG ahiac_Flags; /* See below for definition */
struct Hook *ahiac_SoundFunc; /* AHIA_SoundFunc */
struct Hook *ahiac_PlayerFunc; /* AHIA_PlayerFunc */
Fixed ahiac_PlayerFreq; /* AHIA_PlayerFreq */
Fixed ahiac_MinPlayerFreq; /* AHIA_MinPlayerFreq */
Fixed ahiac_MaxPlayerFreq; /* AHIA_MaxPlayerFreq */
ULONG ahiac_MixFreq; /* AHIA_MixFreq */
UWORD ahiac_Channels; /* AHIA_Channels */
UWORD ahiac_Sounds; /* AHIA_Sounds */
ULONG ahiac_Flags; /* See below for definition */
struct Hook *ahiac_SoundFunc; /* AHIA_SoundFunc */
struct Hook *ahiac_PlayerFunc; /* AHIA_PlayerFunc */
Fixed ahiac_PlayerFreq; /* AHIA_PlayerFreq */
Fixed ahiac_MinPlayerFreq; /* AHIA_MinPlayerFreq */
Fixed ahiac_MaxPlayerFreq; /* AHIA_MaxPlayerFreq */
ULONG ahiac_MixFreq; /* AHIA_MixFreq */
UWORD ahiac_Channels; /* AHIA_Channels */
UWORD ahiac_Sounds; /* AHIA_Sounds */
APTR ahiac_DriverData; /* Unused. Store whatever you want here. */
APTR ahiac_DriverData; /* Unused. Store whatever you want here. */
struct Hook *ahiac_MixerFunc; /* Mixing routine Hook */
struct Hook *ahiac_SamplerFunc; /* Sampler routine Hook */
ULONG ahiac_Obsolete;
ULONG ahiac_BuffSamples; /* Samples to mix this pass. */
ULONG ahiac_MinBuffSamples; /* Min. samples to mix each pass. */
ULONG ahiac_MaxBuffSamples; /* Max. samples to mix each pass. */
ULONG ahiac_BuffSize; /* Buffer size ahiac_MixerFunc needs. */
ULONG ahiac_BuffType; /* Buffer format (V2) */
BOOL (*ahiac_PreTimer)(void); /* Call before mixing (V4) */
void (*ahiac_PostTimer)(void); /* Call after mixing (V4) */
ULONG ahiac_AntiClickSamples; /* AntiClick samples (V6) */
struct Hook *ahiac_PreTimerFunc; /* A Hook wrapper for ahiac_PreTimer (V6) */
struct Hook *ahiac_PostTimerFunc; /* A Hook wrapper for ahiac_PostTimer (V6) */
struct Hook *ahiac_MixerFunc; /* Mixing routine Hook */
struct Hook *ahiac_SamplerFunc; /* Sampler routine Hook */
ULONG ahiac_Obsolete;
ULONG ahiac_BuffSamples; /* Samples to mix this pass. */
ULONG ahiac_MinBuffSamples; /* Min. samples to mix each pass. */
ULONG ahiac_MaxBuffSamples; /* Max. samples to mix each pass. */
ULONG ahiac_BuffSize; /* Buffer size ahiac_MixerFunc needs. */
ULONG ahiac_BuffType; /* Buffer format (V2) */
AHIPreTimerHook ahiac_PreTimer; /* Call before mixing (V4) */
AHIPostTimerHook ahiac_PostTimer; /* Call after mixing (V4) */
ULONG ahiac_AntiClickSamples; /* AntiClick samples (V6) */
struct Hook *ahiac_PreTimerFunc; /* A Hook wrapper for ahiac_PreTimer (V6) */
struct Hook *ahiac_PostTimerFunc; /* A Hook wrapper for ahiac_PostTimer (V6) */
/* The rest is PRIVATE! Hands off! They may change any time.
[lots of private stuff] */

2
workbench/devs/AHI/version.date
View File

@ -1 +1 @@
17.03.2017
14.04.2023

2
workbench/devs/AHI/version.rev
View File

@ -1 +1 @@
1
2