A number of bugfixes.
This commit is contained in:
@@ -17,7 +17,7 @@ static struct
|
|||||||
[ACCREG_cycles] = {0, IREG_cycles},
|
[ACCREG_cycles] = {0, IREG_cycles},
|
||||||
};
|
};
|
||||||
|
|
||||||
void codegen_accumulate(r_data_t *ir, int acc_reg, int delta)
|
void codegen_accumulate(ir_data_t *ir, int acc_reg, int delta)
|
||||||
{
|
{
|
||||||
acc_regs[acc_reg].count += delta;
|
acc_regs[acc_reg].count += delta;
|
||||||
|
|
||||||
|
@@ -141,6 +141,8 @@ extern const device_t *network_card_getdevice(int);
|
|||||||
extern void network_set_wait(int wait);
|
extern void network_set_wait(int wait);
|
||||||
extern int network_get_wait(void);
|
extern int network_get_wait(void);
|
||||||
|
|
||||||
|
extern int network_timer_stop(void);
|
||||||
|
|
||||||
extern void network_queue_put(int tx, void *priv, uint8_t *data, int len);
|
extern void network_queue_put(int tx, void *priv, uint8_t *data, int len);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
@@ -122,6 +122,7 @@ int nic_do_log = ENABLE_NIC_LOG;
|
|||||||
static volatile int net_wait = 0;
|
static volatile int net_wait = 0;
|
||||||
static mutex_t *network_mutex;
|
static mutex_t *network_mutex;
|
||||||
static uint8_t *network_mac;
|
static uint8_t *network_mac;
|
||||||
|
static uint8_t network_timer_active = 0;
|
||||||
static pc_timer_t network_rx_queue_timer;
|
static pc_timer_t network_rx_queue_timer;
|
||||||
static netpkt_t *first_pkt[2] = { NULL, NULL },
|
static netpkt_t *first_pkt[2] = { NULL, NULL },
|
||||||
*last_pkt[2] = { NULL, NULL };
|
*last_pkt[2] = { NULL, NULL };
|
||||||
@@ -354,6 +355,18 @@ network_attach(void *dev, uint8_t *mac, NETRXCB rx, NETWAITCB wait, NETSETLINKST
|
|||||||
timer_add(&network_rx_queue_timer, network_rx_queue, NULL, 0);
|
timer_add(&network_rx_queue_timer, network_rx_queue, NULL, 0);
|
||||||
/* 10 mbps. */
|
/* 10 mbps. */
|
||||||
timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0);
|
timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0);
|
||||||
|
network_timer_active = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Stop the network timer. */
|
||||||
|
void
|
||||||
|
network_timer_stop(void)
|
||||||
|
{
|
||||||
|
if (network_timer_active) {
|
||||||
|
timer_stop(&network_rx_queue_timer);
|
||||||
|
network_timer_active = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -361,7 +374,7 @@ network_attach(void *dev, uint8_t *mac, NETRXCB rx, NETWAITCB wait, NETSETLINKST
|
|||||||
void
|
void
|
||||||
network_close(void)
|
network_close(void)
|
||||||
{
|
{
|
||||||
timer_stop(&network_rx_queue_timer);
|
network_timer_stop();
|
||||||
|
|
||||||
/* If already closed, do nothing. */
|
/* If already closed, do nothing. */
|
||||||
if (network_mutex == NULL) return;
|
if (network_mutex == NULL) return;
|
||||||
|
2
src/pc.c
2
src/pc.c
@@ -681,6 +681,8 @@ pc_reset_hard_close(void)
|
|||||||
{
|
{
|
||||||
ui_sb_set_ready(0);
|
ui_sb_set_ready(0);
|
||||||
|
|
||||||
|
network_timer_close();
|
||||||
|
|
||||||
/* Turn off timer processing to avoid potential segmentation faults. */
|
/* Turn off timer processing to avoid potential segmentation faults. */
|
||||||
timer_close();
|
timer_close();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user