Merge branch '86Box:master' into d943
This commit is contained in:
@@ -759,7 +759,7 @@ ncr53c400_init(const device_t *info)
|
||||
scsi_bus->bus_device = ncr->bus;
|
||||
scsi_bus->timer = ncr->timer;
|
||||
scsi_bus->priv = ncr->priv;
|
||||
ncr400->status_ctrl = STATUS_BUFFER_NOT_READY;
|
||||
ncr400->status_ctrl = 0x00;
|
||||
ncr400->buffer_host_pos = 128;
|
||||
timer_add(&ncr400->timer, ncr53c400_callback, ncr400, 0);
|
||||
|
||||
|
||||
@@ -4796,7 +4796,7 @@ static const device_config_t gd5430_vlb_config[] = {
|
||||
.description = "Linear framebuffer base",
|
||||
.type = CONFIG_SELECTION,
|
||||
.default_string = NULL,
|
||||
.default_int = 2,
|
||||
.default_int = 2048,
|
||||
.file_filter = NULL,
|
||||
.spinner = { 0 },
|
||||
.selection = {
|
||||
@@ -4871,7 +4871,7 @@ static const device_config_t gd5434_vlb_config[] = {
|
||||
.description = "Linear framebuffer base",
|
||||
.type = CONFIG_SELECTION,
|
||||
.default_string = NULL,
|
||||
.default_int = 2,
|
||||
.default_int = 2048,
|
||||
.file_filter = NULL,
|
||||
.spinner = { 0 },
|
||||
.selection = {
|
||||
@@ -4982,8 +4982,8 @@ const device_t gd5420_isa_device = {
|
||||
};
|
||||
|
||||
const device_t gd5420_onboard_device = {
|
||||
.name = "Cirrus Logic GD5420 (ISA)",
|
||||
.internal_name = "cl_gd5420_isa",
|
||||
.name = "Cirrus Logic GD5420 (ISA) (On-Board)",
|
||||
.internal_name = "cl_gd5420_onboard",
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = CIRRUS_ID_CLGD5420 | 0x200,
|
||||
.init = gd54xx_init,
|
||||
|
||||
Reference in New Issue
Block a user