m68k/mac: Disentangle VIA and OSS initialization

Browse source

macintosh_config->via_type is meaningless on Mac IIfx (i.e. the only
model with OSS chip), so skip the via_type switch statement.

Call oss_init() before via_init() because it is more important and
because that is the right place to initialize the oss_present flag.

On this model, bringing forward oss_init() and delaying via_init()
is no problem because those functions are independent.

The only requirement here is that oss_register_interrupts() happens
after via_init(). That is, mac_init_IRQ() happens after config_mac().

Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

...

This commit is contained in:

Finn Thain 2017-10-26 22:45:24 -04:00 • committed by Geert Uytterhoeven

parent 0e37a23ebd

commit 7a0bb44270

3 changed files with 18 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/m68k/mac/config.c

View file

8

arch/m68k/mac/oss.c

View file

32

arch/m68k/mac/via.c

View file