mirror of
https://git.freebsd.org/ports.git
synced 2025-07-09 05:19:16 -04:00
a5d6daade5
- Bump PORTREVISIONs. PR: 200255 PR: 200256 PR: 200257 Submitted by: venture37@geeklan.co.uk Obtained from: http://git.qemu.org/?p=qemu.git;a=commitdiff;h=e907746266721f305d67bc0718795fedee2e824c Security: http://vuxml.FreeBSD.org/freebsd/2780e442-fc59-11e4-b18b-6805ca1d3bb1.html
44 lines
1.3 KiB
Text
44 lines
1.3 KiB
Text
--- a/hw/fdc.c
|
|
+++ b/hw/fdc.c
|
|
@@ -1324,7 +1324,7 @@ static uint32_t fdctrl_read_data (fdctrl
|
|
{
|
|
fdrive_t *cur_drv;
|
|
uint32_t retval = 0;
|
|
- int pos;
|
|
+ uint32_t pos;
|
|
|
|
cur_drv = get_cur_drv(fdctrl);
|
|
fdctrl->dsr &= ~FD_DSR_PWRDOWN;
|
|
@@ -1333,8 +1333,8 @@ static uint32_t fdctrl_read_data (fdctrl
|
|
return 0;
|
|
}
|
|
pos = fdctrl->data_pos;
|
|
+ pos %= FD_SECTOR_LEN;
|
|
if (fdctrl->msr & FD_MSR_NONDMA) {
|
|
- pos %= FD_SECTOR_LEN;
|
|
if (pos == 0) {
|
|
if (fdctrl->data_pos != 0)
|
|
if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) {
|
|
@@ -1680,8 +1680,11 @@ static void fdctrl_handle_option (fdctrl
|
|
static void fdctrl_handle_drive_specification_command (fdctrl_t *fdctrl, int direction)
|
|
{
|
|
fdrive_t *cur_drv = get_cur_drv(fdctrl);
|
|
+ uint32_t pos;
|
|
+
|
|
+ pos = fdctrl->data_pos - 1;
|
|
+ pos %= FD_SECTOR_LEN;
|
|
-
|
|
- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) {
|
|
+ if (fdctrl->fifo[pos] & 0x80) {
|
|
/* Command parameters done */
|
|
if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) {
|
|
fdctrl->fifo[0] = fdctrl->fifo[1];
|
|
@@ -1778,7 +1782,7 @@ static uint8_t command_to_handler[256];
|
|
static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value)
|
|
{
|
|
fdrive_t *cur_drv;
|
|
- int pos;
|
|
+ uint32_t pos;
|
|
|
|
/* Reset mode */
|
|
if (!(fdctrl->dor & FD_DOR_nRESET)) {
|