Merge pull request #3144 from lemondrops/more-warning-fixes
More warning fixes
This commit is contained in:
@@ -743,17 +743,17 @@ static const device_config_t pcjr_config[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const device_t pcjr_device = {
|
const device_t pcjr_device = {
|
||||||
"IBM PCjr",
|
.name = "IBM PCjr",
|
||||||
"pcjr",
|
.internal_name = "pcjr",
|
||||||
0,
|
.flags = 0,
|
||||||
0,
|
.local = 0,
|
||||||
NULL,
|
.init = NULL,
|
||||||
NULL,
|
.close = NULL,
|
||||||
NULL,
|
.reset = NULL,
|
||||||
{ NULL },
|
{ .available = NULL },
|
||||||
speed_changed,
|
.speed_changed = speed_changed,
|
||||||
NULL,
|
.force_redraw = NULL,
|
||||||
pcjr_config
|
.config = pcjr_config
|
||||||
};
|
};
|
||||||
|
|
||||||
int
|
int
|
||||||
|
@@ -90,14 +90,6 @@ setCDROMSpeed(QAbstractItemModel *model, const QModelIndex &idx, uint8_t speed)
|
|||||||
model->setData(i, speed, Qt::UserRole);
|
model->setData(i, speed, Qt::UserRole);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
setCDROMEarly(QAbstractItemModel *model, const QModelIndex &idx, bool early)
|
|
||||||
{
|
|
||||||
auto i = idx.siblingAtColumn(2);
|
|
||||||
model->setData(i, (early == true) ? QObject::tr("On") : QObject::tr("Off"));
|
|
||||||
model->setData(i, early, Qt::UserRole);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
setCDROMType(QAbstractItemModel *model, const QModelIndex &idx, int type)
|
setCDROMType(QAbstractItemModel *model, const QModelIndex &idx, int type)
|
||||||
{
|
{
|
||||||
|
@@ -338,9 +338,9 @@ const device_t fdc37c669_370_device = {
|
|||||||
.internal_name = "fdc37c669_370",
|
.internal_name = "fdc37c669_370",
|
||||||
.flags = 0,
|
.flags = 0,
|
||||||
.local = 1,
|
.local = 1,
|
||||||
fdc37c669_init,
|
.init = fdc37c669_init,
|
||||||
fdc37c669_close,
|
.close = fdc37c669_close,
|
||||||
.reset = NULL,
|
.reset = NULL,
|
||||||
{ .available = NULL },
|
{ .available = NULL },
|
||||||
.speed_changed = NULL,
|
.speed_changed = NULL,
|
||||||
.force_redraw = NULL,
|
.force_redraw = NULL,
|
||||||
|
@@ -793,17 +793,17 @@ access_bus_init(const device_t *info)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static const device_t access_bus_device = {
|
static const device_t access_bus_device = {
|
||||||
"SMC FDC37C932FR ACCESS.bus",
|
.name = "SMC FDC37C932FR ACCESS.bus",
|
||||||
"access_bus",
|
.internal_name = "access_bus",
|
||||||
0,
|
.flags = 0,
|
||||||
0x03,
|
.local = 0x03,
|
||||||
access_bus_init,
|
.init = access_bus_init,
|
||||||
access_bus_close,
|
.close = access_bus_close,
|
||||||
NULL,
|
.reset = NULL,
|
||||||
{ NULL },
|
{ .available = NULL },
|
||||||
NULL,
|
.speed_changed = NULL,
|
||||||
NULL,
|
.force_redraw = NULL,
|
||||||
NULL
|
.config = NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
Reference in New Issue
Block a user