Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1376 add a3000 scsi controller and tape support for amiga unix amix #1414

Merged
merged 14 commits into from
Sep 1, 2024
Merged

1376 add a3000 scsi controller and tape support for amiga unix amix #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d71edd1
enhancement: added CD and Tape drive buttons
midwan Aug 27, 2024
aa0e55a
Refactoring of GUI HD Panel
midwan Aug 30, 2024
4799000
Merge branch 'preview' into 1376-add-a3000-scsi-controller-and-tape-s…
midwan Aug 31, 2024
5ab73ea
bugfix: Fixes for HDD panel windows
midwan Aug 31, 2024
1f787c5
bugfix: Fixed default paths in dialogs
midwan Aug 31, 2024
d4e0226
enhancement: Harmonize TapeDrive dialog logic with others
midwan Aug 31, 2024
212cfca
enhancement: Updated Create HF dialog
midwan Aug 31, 2024
9ace631
enhancement: fix navigation in Create HDF dialog
midwan Aug 31, 2024
0f9defc
enhancement: Added Special Monitors support
midwan Sep 1, 2024
5a651b4
enhancement: Added special monitors support in GUI
midwan Sep 1, 2024
a20ae6a
enhancement: fixed navigation for Tape Drive and other HDD panel dialogs
midwan Sep 1, 2024
fc9d172
enhancement: improvements in the Add HardDrive dialog
midwan Sep 1, 2024
fbe973d
enhancement: fixed navigation in Panel Harddrive
midwan Sep 1, 2024
d6f2651
disable button that's not implemented yet
midwan Sep 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,10 @@ add_executable(${PROJECT_NAME}
src/scsi.cpp
src/scsiemul.cpp
src/scsitape.cpp
src/specialmonitors.cpp
src/statusline.cpp
src/tabletlibrary.cpp
src/test_card.cpp
src/tinyxml2.cpp
src/traps.cpp
src/uaeexe.cpp
Expand Down Expand Up @@ -289,6 +291,7 @@ add_executable(${PROJECT_NAME}
src/osdep/gui/EditFilesysVirtual.cpp
src/osdep/gui/EditFilesysHardfile.cpp
src/osdep/gui/EditFilesysHardDrive.cpp
src/osdep/gui/EditTapeDrive.cpp
src/osdep/gui/PanelAbout.cpp
src/osdep/gui/PanelPaths.cpp
src/osdep/gui/PanelQuickstart.cpp
Expand Down
2 changes: 1 addition & 1 deletion CMakeSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@
"wslPath": "${defaultWSLPath}"
}
]
}
}
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,10 @@ OBJS = \
src/scsi.o \
src/scsiemul.o \
src/scsitape.o \
src/specialmonitors.o \
src/statusline.o \
src/tabletlibrary.o \
src/test_card.o \
src/tinyxml2.o \
src/traps.o \
src/uaeexe.o \
Expand Down Expand Up @@ -592,6 +594,7 @@ OBJS = \
src/osdep/gui/EditFilesysVirtual.o \
src/osdep/gui/EditFilesysHardfile.o \
src/osdep/gui/EditFilesysHardDrive.o \
src/osdep/gui/EditTapeDrive.o \
src/osdep/gui/PanelAbout.o \
src/osdep/gui/PanelPaths.o \
src/osdep/gui/PanelQuickstart.o \
Expand Down
8 changes: 4 additions & 4 deletions src/cfgfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2596,7 +2596,7 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
}
cfgfile_dwrite_str(f, _T("genlock_effects"), tmp);
}
#ifndef AMIBERRY
#ifdef WITH_SPECIALMONITORS
cfgfile_dwrite_strarr(f, _T("monitoremu"), specialmonitorconfignames, p->monitoremu);
#endif
cfgfile_dwrite(f, _T("monitoremu_monitor"), _T("%d"), p->monitoremu_mon);
Expand Down Expand Up @@ -6033,7 +6033,7 @@ static int cfgfile_parse_hardware (struct uae_prefs *p, const TCHAR *option, TCH
|| cfgfile_strval(option, value, _T("comp_trustnaddr"), &p->comptrustnaddr, compmode, 0)
|| cfgfile_strval(option, value, _T("collision_level"), &p->collision_level, collmode, 0)
|| cfgfile_strval(option, value, _T("parallel_matrix_emulation"), &p->parallel_matrix_emulation, epsonprinter, 0)
#ifndef AMIBERRY
#ifdef WITH_SPECIALMONITORS
|| cfgfile_strval(option, value, _T("monitoremu"), &p->monitoremu, specialmonitorconfignames, 0)
#endif
|| cfgfile_strval(option, value, _T("genlockmode"), &p->genlock_image, genlockmodes, 0)
Expand Down Expand Up @@ -7573,8 +7573,8 @@ static void parse_hardfile_spec (struct uae_prefs *p, const TCHAR *spec)
}
const std::string x2 = parameter.substr(pos + 1, parameter.length());
#ifdef FILESYS
default_hfdlg(&current_hfdlg);
updatehdfinfo(true, false);
default_hfdlg(&current_hfdlg, false);
updatehdfinfo(true, false, false);

current_hfdlg.ci.type = UAEDEV_HDF;
_tcscpy(current_hfdlg.ci.devname, x1.c_str());
Expand Down
2 changes: 2 additions & 0 deletions src/expansion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6866,6 +6866,7 @@ static const struct cpuboardsubtype dbk_sub[] = {
ncr_dkb_autoconfig_init, NULL, BOARD_AUTOCONFIG_Z2, 0,
cpuboard_dkb_cobra_settings
},
#ifdef WITH_PCI
{
_T("Wildfire"),
_T("wildfire"),
Expand All @@ -6876,6 +6877,7 @@ static const struct cpuboardsubtype dbk_sub[] = {
0,
dkb_wildfire_pci_init, NULL, BOARD_NONAUTOCONFIG_BEFORE, 0
},
#endif // WITH_PCI
#endif
{
NULL
Expand Down
15 changes: 13 additions & 2 deletions src/include/options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1229,6 +1229,14 @@ extern struct uae_prefs currprefs, changed_prefs;
extern int machdep_init(void);
extern void machdep_free(void);

struct cddlg_vals
{
struct uaedev_config_info ci;
};
struct tapedlg_vals
{
struct uaedev_config_info ci;
};
struct fsvdlg_vals
{
struct uaedev_config_info ci;
Expand All @@ -1244,13 +1252,16 @@ struct hfdlg_vals
int forcedcylinders;
bool rdb;
};
extern struct cddlg_vals current_cddlg;
extern struct tapedlg_vals current_tapedlg;
extern struct fsvdlg_vals current_fsvdlg;
extern struct hfdlg_vals current_hfdlg;

extern void hardfile_testrdb(struct hfdlg_vals* hdf);
extern void default_tapedlg(struct tapedlg_vals* f);
extern void default_fsvdlg(struct fsvdlg_vals* f);
extern void default_hfdlg(struct hfdlg_vals* f);
extern void updatehdfinfo(bool force, bool defaults);
extern void default_hfdlg(struct hfdlg_vals* f, bool rdb);
extern void updatehdfinfo(bool force, bool defaults, bool realdrive);

#ifdef AMIBERRY
struct amiberry_customised_layout
Expand Down
27 changes: 14 additions & 13 deletions src/include/specialmonitors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@

#include "memory.h"

bool emulate_specialmonitors(struct vidbuffer *src, struct vidbuffer *dst);
bool emulate_specialmonitors_line(struct vidbuffer *src, struct vidbuffer *dst, int line);
void specialmonitor_store_fmode(int vpos, int hpos, uae_u16 fmode);
void specialmonitor_reset(void);
bool specialmonitor_need_genlock(void);
bool specialmonitor_uses_control_lines(void);
bool specialmonitor_autoconfig_init(struct autoconfig_info*);
bool emulate_genlock(struct vidbuffer*, struct vidbuffer*, bool);
bool emulate_grayscale(struct vidbuffer*, struct vidbuffer*);
bool specialmonitor_linebased(void);
extern bool emulate_specialmonitors(struct vidbuffer *src, struct vidbuffer *dst);
extern bool emulate_specialmonitors_line(struct vidbuffer *src, struct vidbuffer *dst, int line);
extern void specialmonitor_store_fmode(int vpos, int hpos, uae_u16 fmode);
extern void specialmonitor_reset(void);
extern bool specialmonitor_need_genlock(void);
extern bool specialmonitor_uses_control_lines(void);
extern bool specialmonitor_autoconfig_init(struct autoconfig_info*);
extern bool emulate_genlock(struct vidbuffer*, struct vidbuffer*, bool);
extern bool emulate_grayscale(struct vidbuffer*, struct vidbuffer*);
extern bool specialmonitor_linebased(void);
extern void genlock_infotext(uae_u8*, struct vidbuffer*);

const TCHAR *specialmonitorfriendlynames[];
const TCHAR *specialmonitormanufacturernames[];
const TCHAR *specialmonitorconfignames[];
extern const TCHAR *specialmonitorfriendlynames[];
extern const TCHAR *specialmonitormanufacturernames[];
extern const TCHAR *specialmonitorconfignames[];

#endif /* UAE_SPECIALMONITORS_H */
Loading
Loading