claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Some code smell fixes from sonarlint

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-05-11 03:02:36 -04:00
parent d314255362
commit 6c1e4a8e2c
137 changed files with 3354 additions and 2900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/pic.c
View File

@@ -45,17 +45,21 @@ enum {
STATE_ICW4
};
pic_t pic, pic2;
pic_t pic;
pic_t pic2;
static pc_timer_t pic_timer;
static int shadow = 0, elcr_enabled = 0,
tmr_inited = 0, latched = 0,
pic_pci = 0, kbd_latch = 0,
mouse_latch = 0;
static int shadow = 0;
static int elcr_enabled = 0;
static int tmr_inited = 0;
static int latched = 0;
static int pic_pci = 0;
static int kbd_latch = 0;
static int mouse_latch = 0;
static uint16_t smi_irq_mask = 0x0000,
smi_irq_status = 0x0000;
static uint16_t smi_irq_mask = 0x0000;
static uint16_t smi_irq_status = 0x0000;
static uint16_t latched_irqs = 0x0000;
@@ -187,10 +191,10 @@ find_best_interrupt(pic_t *dev)
{
uint8_t b;
uint8_t intr;
int i, j;
int j;
int ret = -1;
for (i = 0; i < 8; i++) {
for (uint8_t i = 0; i < 8; i++) {
j = (i + dev->priority) & 7;
b = 1 << j;
@@ -330,10 +334,11 @@ pic_acknowledge(pic_t *dev)
static uint8_t
pic_non_specific_find(pic_t *dev)
{
int i, j;
uint8_t b, irq = 0xff;
int j;
uint8_t b;
uint8_t irq = 0xff;
for (i = 0; i < 8; i++) {
for (uint8_t i = 0; i < 8; i++) {
j = (i + dev->priority) & 7;
b = (1 << j);
@@ -616,12 +621,13 @@ pic2_init(void)
void
picint_common(uint16_t num, int level, int set)
{
int i, raise;
uint8_t b, slaves = 0;
int raise;
uint8_t b;
uint8_t slaves = 0;
/* Make sure to ignore all slave IRQ's, and in case of AT+,
translate IRQ 2 to IRQ 9. */
for (i = 0; i < 8; i++) {
for (uint8_t i = 0; i < 8; i++) {
b = (1 << i);
raise = num & b;
@@ -804,7 +810,7 @@ pic_irq_ack(void)
int
picinterrupt(void)
{
int i, ret = -1;
int ret = -1;
if (pic.int_pending) {
if (pic_slave_on(&pic, pic.interrupt)) {
@@ -822,7 +828,7 @@ picinterrupt(void)
pit_devs[1].set_gate(pit_devs[1].data, 0, 0);
/* Two ACK's - do them in a loop to avoid potential compiler misoptimizations. */
for (i = 0; i < 2; i++) {
for (uint8_t i = 0; i < 2; i++) {
ret = pic_irq_ack_read(&pic, pic.ack_bytes);
pic.ack_bytes = (pic.ack_bytes + 1) % (pic_i86_mode(&pic) ? 2 : 3);