[General][Qt] Merge upstream 2015-03-15.

[csp-qt/common_source_project-fm7.git] / source / src / vm / pc6031.cpp

diff --git a/source/src/vm/pc6031.cpp b/source/src/vm/pc6031.cpp
index e1ca5a1..7c82751 100644 (file)
--- a/source/src/vm/pc6031.cpp
+++ b/source/src/vm/pc6031.cpp
@@ -17,7 +17,6 @@
 
 #include "pc6031.h"
 #include "disk.h"
-#include "../fileio.h"
 
 int PC6031::Seek88(int drvno, int trackno, int sectno)
 {
@@ -27,7 +26,7 @@ int PC6031::Seek88(int drvno, int trackno, int sectno)
                cur_pos[drvno] = 0;
                
                if(disk[drvno]->get_track(trackno >> 1, trackno & 1)) {
-                       for(int i = 0; i < disk[drvno]->sector_num; i++) {
+                       for(int i = 0; i < disk[drvno]->sector_num.sd; i++) {
                                if(disk[drvno]->get_sector(trackno >> 1, 0/*trackno & 1*/, i)) {
                                        if(disk[drvno]->id[2] == sectno) {
                                                return 1;
@@ -42,7 +41,7 @@ int PC6031::Seek88(int drvno, int trackno, int sectno)
 unsigned char PC6031::Getc88(int drvno)
 {
        if(drvno < 2 && disk[drvno]->sector != NULL) {
-               if(cur_pos[drvno] >= disk[drvno]->sector_size) {
+               if(cur_pos[drvno] >= disk[drvno]->sector_size.sd) {
                        cur_sct[drvno]++;
                        if(!Seek88(drvno, cur_trk[drvno], cur_sct[drvno])) {
 //                             cur_trk[drvno]++;
@@ -62,7 +61,7 @@ unsigned char PC6031::Getc88(int drvno)
 int PC6031::Putc88(int drvno, unsigned char dat)
 {
        if(drvno < 2 && disk[drvno]->sector != NULL) {
-               if(cur_pos[drvno] >= disk[drvno]->sector_size) {
+               if(cur_pos[drvno] >= disk[drvno]->sector_size.sd) {
                        cur_sct[drvno]++;
                        if(!Seek88(drvno, cur_trk[drvno], cur_sct[drvno])) {
 //                             cur_trk[drvno]++;
@@ -340,10 +339,10 @@ uint32 PC6031::read_signal(int ch)
 // user interface
 // ----------------------------------------------------------------------------
 
-void PC6031::open_disk(int drv, _TCHAR path[], int offset)
+void PC6031::open_disk(int drv, _TCHAR path[], int bank)
 {
        if(drv < 2) {
-               disk[drv]->open(path, offset);
+               disk[drv]->open(path, bank);
                Seek88(drv, 0, 1);
        }
 }