From b560f325ae21591ae116115f6aaf4540cdf73812 Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 2 May 2009 09:31:14 +0000
Subject: [PATCH] Finish removing VU Skip from Linux, and fix a few compiler
 warnings left over from the work on CDVD.cpp.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1115 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/CDVD.h            | 13 -------------
 pcsx2/CdRom.cpp         |  3 ---
 pcsx2/CdRom.h           |  6 ++----
 pcsx2/Linux/interface.c |  9 ---------
 pcsx2/Linux/pcsx2.glade | 21 ---------------------
 5 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/pcsx2/CDVD.h b/pcsx2/CDVD.h
index 457e110926..3aaa5647a1 100644
--- a/pcsx2/CDVD.h
+++ b/pcsx2/CDVD.h
@@ -310,20 +310,7 @@ extern void  cdvdActionInterrupt();
 extern void  cdvdReadInterrupt();
 void cdvdNewDiskCB();
 u8   cdvdRead(u8 key);
-u8   cdvdRead18(void);
 void cdvdWrite(u8 key, u8 rt);
-void cdvdWrite04(u8 rt);
-void cdvdWrite05(u8 rt);
-void cdvdWrite06(u8 rt);
-void cdvdWrite07(u8 rt);
-void cdvdWrite08(u8 rt);
-void cdvdWrite0A(u8 rt);
-void cdvdWrite0F(u8 rt);
-void cdvdWrite14(u8 rt);
-void cdvdWrite16(u8 rt);
-void cdvdWrite17(u8 rt);
-void cdvdWrite18(u8 rt);
-void cdvdWrite3A(u8 rt);
 
 // Platform dependent system time assignment (see WinMisc / LnxMisc)
 extern void cdvdSetSystemTime( cdvdStruct& setme );
diff --git a/pcsx2/CdRom.cpp b/pcsx2/CdRom.cpp
index bb2f022b7a..07bcf3a6ac 100644
--- a/pcsx2/CdRom.cpp
+++ b/pcsx2/CdRom.cpp
@@ -85,9 +85,6 @@ u8 Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 };
 //#define cdReadTime ((PSXCLK / 75) / BIAS)
 unsigned long cdReadTime;// = ((PSXCLK / 75) / BIAS);
 
-#define btoi(b)		((b)/16*10 + (b)%16)		/* BCD to u_char */
-#define itob(i)		((i)/10*16 + (i)%10)		/* u_char to BCD */
-
 #define CDR_INT(eCycle)    PSX_INT(IopEvt_Cdrom, eCycle)
 #define CDREAD_INT(eCycle) PSX_INT(IopEvt_CdromRead, eCycle)
 
diff --git a/pcsx2/CdRom.h b/pcsx2/CdRom.h
index 10757dff7e..36ceba98a2 100644
--- a/pcsx2/CdRom.h
+++ b/pcsx2/CdRom.h
@@ -72,12 +72,10 @@ struct cdrStruct
 	char Unused[4087];
 };
 
-extern cdrStruct cdr;
-
-s32  MSFtoLSN(u8 *Time);
-void LSNtoMSF(u8 *Time, s32 lsn);
 void AddIrqQueue(u8 irq, unsigned long ecycle);
 
+extern cdrStruct cdr;
+
 void cdrReset();
 void  cdrInterrupt();
 void  cdrReadInterrupt();
diff --git a/pcsx2/Linux/interface.c b/pcsx2/Linux/interface.c
index 035bc3fe03..87e6a49abf 100644
--- a/pcsx2/Linux/interface.c
+++ b/pcsx2/Linux/interface.c
@@ -3859,7 +3859,6 @@ create_CpuDlg (void)
   GSList *GtkRadioButton_LimitNormal_group = NULL;
   GtkWidget *GtkRadioButton_LimitLimit;
   GtkWidget *GtkRadioButton_LimitFS;
-  GtkWidget *GtkRadioButton_VUSkip;
   GtkWidget *label41;
   GtkWidget *frame23;
   GtkWidget *alignment18;
@@ -4028,13 +4027,6 @@ create_CpuDlg (void)
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (GtkRadioButton_LimitFS), GtkRadioButton_LimitNormal_group);
   GtkRadioButton_LimitNormal_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (GtkRadioButton_LimitFS));
 
-  GtkRadioButton_VUSkip = gtk_radio_button_new_with_mnemonic (NULL, _("VU Skip - Same as Frame Skip, but tried to skip more. \n               Artifacts might be present, but will be faster"));
-  gtk_widget_set_name (GtkRadioButton_VUSkip, "GtkRadioButton_VUSkip");
-  gtk_widget_show (GtkRadioButton_VUSkip);
-  gtk_box_pack_start (GTK_BOX (vbox29), GtkRadioButton_VUSkip, FALSE, FALSE, 0);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (GtkRadioButton_VUSkip), GtkRadioButton_LimitNormal_group);
-  GtkRadioButton_LimitNormal_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (GtkRadioButton_VUSkip));
-
   label41 = gtk_label_new (_("Frame Limiting (F4 switches in-game)"));
   gtk_widget_set_name (label41, "label41");
   gtk_widget_show (label41);
@@ -4198,7 +4190,6 @@ create_CpuDlg (void)
   GLADE_HOOKUP_OBJECT (CpuDlg, GtkRadioButton_LimitNormal, "GtkRadioButton_LimitNormal");
   GLADE_HOOKUP_OBJECT (CpuDlg, GtkRadioButton_LimitLimit, "GtkRadioButton_LimitLimit");
   GLADE_HOOKUP_OBJECT (CpuDlg, GtkRadioButton_LimitFS, "GtkRadioButton_LimitFS");
-  GLADE_HOOKUP_OBJECT (CpuDlg, GtkRadioButton_VUSkip, "GtkRadioButton_VUSkip");
   GLADE_HOOKUP_OBJECT (CpuDlg, label41, "label41");
   GLADE_HOOKUP_OBJECT (CpuDlg, frame23, "frame23");
   GLADE_HOOKUP_OBJECT (CpuDlg, alignment18, "alignment18");
diff --git a/pcsx2/Linux/pcsx2.glade b/pcsx2/Linux/pcsx2.glade
index ae3a436467..bb90d59e3d 100644
--- a/pcsx2/Linux/pcsx2.glade
+++ b/pcsx2/Linux/pcsx2.glade
@@ -6859,27 +6859,6 @@ Version x.x</property>
 			      <property name="fill">False</property>
 			    </packing>
 			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="GtkRadioButton_VUSkip">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">VU Skip - Same as Frame Skip, but tried to skip more. 
-               Artifacts might be present, but will be faster</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <property name="group">GtkRadioButton_LimitNormal</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
 			</widget>
 		      </child>
 		    </widget>