fix bug kergoth introduced in rev 1.43

fd was an integer static to the function which means that the assignment only
happens once. This is ok, when we don't close the device, but not if we close
it after usage. Thanks to eilers for confirming! I wonder why noone else spotted this...

1 files changed, 1 insertions, 1 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 62e3569..7d862cd 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -1115,328 +1115,328 @@ int iPAQ::lightSensorResolution ( ) const
 void Zaurus::init ( )
 {
 	d-> m_vendorstr = "Sharp";
 	d-> m_vendor = Vendor_Sharp;
 
 	QFile f ( "/proc/filesystems" );
 	QString model;
 
 	if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) {
 		d-> m_vendorstr = "OpenZaurus Team";
 		d-> m_systemstr = "OpenZaurus";
 		d-> m_system = System_OpenZaurus;
 
 		f. close ( );
 
 		f. setName ( "/etc/oz_version" );
 		if ( f. open ( IO_ReadOnly )) {
 			QTextStream ts ( &f );
 			d-> m_sysverstr = ts. readLine ( );//. mid ( 10 );
 			f. close ( );
 		}
 	}
 	else {
 		d-> m_systemstr = "Zaurus";
 		d-> m_system = System_Zaurus;
 	}
 
 	f. setName ( "/proc/cpuinfo" );
 	if ( f. open ( IO_ReadOnly ) ) {
 		QTextStream ts ( &f );
 		QString line;
 		while( line = ts. readLine ( ) ) {
 			if ( line. left ( 8 ) == "Hardware" )
 				break;
 		}
 		int loc = line. find ( ":" );
 		if ( loc != -1 )
 			model = line. mid ( loc + 2 ). simplifyWhiteSpace( );
 	}
 
 	if ( model == "SHARP Corgi" ) {
 		d-> m_model = Model_Zaurus_SLC700;
 		d-> m_modelstr = "Zaurus SL-C700";
 	} else if ( model == "SHARP Poodle" ) {
 		d-> m_model = Model_Zaurus_SLB600;
 		d-> m_modelstr = "Zaurus SL-B500 or SL-5600";
 	} else if ( model = "Sharp-Collie" ) {
 		d-> m_model = Model_Zaurus_SL5500;
 		d-> m_modelstr = "Zaurus SL-5500 or SL-5000d";
 	} else {
 		d-> m_model = Model_Zaurus_SL5500;
 		d-> m_modelstr = "Zaurus (Model unknown)";
 	}
 
 	bool flipstate = false;
 	switch ( d-> m_model ) {
 		case Model_Zaurus_SLA300:
 			d-> m_rotation = Rot0;
 			break;
 		case Model_Zaurus_SLC700:
 			// Note: need to 1) set flipstate based on physical screen orientation
 			// and 2) check to see if the user overrode the rotation direction
 			// using appearance, and if so, remove that item from the Config to
 			// ensure the rotate applet flips us back to the previous state.
 			if ( flipstate ) {
 				// 480x640
 				d-> m_rotation = Rot0;
 				d-> m_direction = CW;
 			} else {
 				// 640x480
 				d-> m_rotation = Rot270;
 				d-> m_direction = CCW;
 			}
 			break;
 		case Model_Zaurus_SLB600:
 		case Model_Zaurus_SL5500:
 		case Model_Zaurus_SL5000:
 		default:
 			d-> m_rotation = Rot270;
 			break;
 	}
 	m_leds [0] = Led_Off;
 }
 
 void Zaurus::initButtons ( )
 {
 	if ( d-> m_buttons )
 		return;
 
 	d-> m_buttons = new QValueList <ODeviceButton>;
 
 	struct z_button * pz_buttons;
 	int buttoncount;
 	switch ( d-> m_model ) {
 		case Model_Zaurus_SLC700:
 			pz_buttons = z_buttons_c700;
 			buttoncount = ARRAY_SIZE(z_buttons_c700);
 			break;
 		default:
 			pz_buttons = z_buttons;
 			buttoncount = ARRAY_SIZE(z_buttons);
 			break;
 	}
 
 	for ( int i = 0; i < buttoncount; i++ ) {
 		struct z_button *zb = pz_buttons + i;
 		ODeviceButton b;
 
 		b. setKeycode ( zb-> code );
 		b. setUserText ( QObject::tr ( "Button", zb-> utext ));
 		b. setPixmap ( Resource::loadPixmap ( zb-> pix ));
 		b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( zb-> fpressedservice ), zb-> fpressedaction ));
 		b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( zb-> fheldservice ), zb-> fheldaction ));
 
 		d-> m_buttons-> append ( b );
 	}
 
 	reloadButtonMapping ( );
 
 	QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
 	connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
 }
 
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
 //#include <asm/sharp_char.h> // including kernel headers is evil ...
 
 #define SHARP_DEV_IOCTL_COMMAND_START 0x5680
 
 #define	SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
 
 #define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
 #define SHARP_BUZ_KEYSOUND         2  /* key sound */
 #define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
 
 /* --- for SHARP_BUZZER device --- */
 
 //#define	SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 //#define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
 
 #define SHARP_BUZZER_SETVOLUME   (SHARP_BUZZER_IOCTL_START+1)
 #define SHARP_BUZZER_GETVOLUME   (SHARP_BUZZER_IOCTL_START+2)
 #define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3)
 #define SHARP_BUZZER_SETMUTE     (SHARP_BUZZER_IOCTL_START+4)
 #define SHARP_BUZZER_STOPSOUND   (SHARP_BUZZER_IOCTL_START+5)
 
 //#define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
 //#define SHARP_BUZ_KEYSOUND         2  /* key sound */
 
 //#define SHARP_PDA_ILLCLICKSOUND    3  /* illegal click */
 //#define SHARP_PDA_WARNSOUND        4  /* warning occurred */
 //#define SHARP_PDA_ERRORSOUND       5  /* error occurred */
 //#define SHARP_PDA_CRITICALSOUND    6  /* critical error occurred */
 //#define SHARP_PDA_SYSSTARTSOUND    7  /* system start */
 //#define SHARP_PDA_SYSTEMENDSOUND   8  /* system shutdown */
 //#define SHARP_PDA_APPSTART         9  /* application start */
 //#define SHARP_PDA_APPQUIT         10  /* application ends */
 
 //#define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
 //#define SHARP_BUZ_DAILY_ALARM     12  /* daily alarm */
 //#define SHARP_BUZ_GOT_PHONE_CALL  13  /* phone call sound */
 //#define SHARP_BUZ_GOT_MAIL        14  /* mail sound */
 //
 
 #define	SHARP_LED_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_LED_SETSTATUS   (SHARP_LED_IOCTL_START+1)
 
 typedef struct sharp_led_status {
   int which;   /* select which LED status is wanted. */
   int status;  /* set new led status if you call SHARP_LED_SETSTATUS */
 } sharp_led_status;
 
 #define SHARP_LED_MAIL_EXISTS  9       /* mail status (exists or not) */
 
 #define LED_MAIL_NO_UNREAD_MAIL  0   /* for SHARP_LED_MAIL_EXISTS */
 #define LED_MAIL_NEWMAIL_EXISTS  1   /* for SHARP_LED_MAIL_EXISTS */
 #define LED_MAIL_UNREAD_MAIL_EX  2   /* for SHARP_LED_MAIL_EXISTS */
 
 // #include <asm/sharp_apm.h> // including kernel headers is evil ...
 
 #define APM_IOCGEVTSRC          OD_IOR( 'A', 203, int )
 #define APM_IOCSEVTSRC          OD_IORW( 'A', 204, int )
 #define APM_EVT_POWER_BUTTON    (1 << 0)
 
 #define FL_IOCTL_STEP_CONTRAST    100
 
 
 void Zaurus::buzzer ( int sound )
 {
-	static int fd = ::open ( "/dev/sharp_buz", O_WRONLY|O_NONBLOCK );
+	int fd = ::open ( "/dev/sharp_buz", O_WRONLY|O_NONBLOCK );
 
 	if ( fd >= 0 ) {
 		::ioctl ( fd, SHARP_BUZZER_MAKESOUND, sound );
 		::close ( fd );
 	}
 }
 
 
 void Zaurus::alarmSound ( )
 {
 	buzzer ( SHARP_BUZ_SCHEDULE_ALARM );
 }
 
 void Zaurus::touchSound ( )
 {
 	buzzer ( SHARP_BUZ_TOUCHSOUND );
 }
 
 void Zaurus::keySound ( )
 {
 	buzzer ( SHARP_BUZ_KEYSOUND );
 }
 
 
 QValueList <OLed> Zaurus::ledList ( ) const
 {
 	QValueList <OLed> vl;
 	vl << Led_Mail;
 	return vl;
 }
 
 QValueList <OLedState> Zaurus::ledStateList ( OLed l ) const
 {
 	QValueList <OLedState> vl;
 
 	if ( l == Led_Mail )
 		vl << Led_Off << Led_On << Led_BlinkSlow;
 	return vl;
 }
 
 OLedState Zaurus::ledState ( OLed which ) const
 {
 	if ( which == Led_Mail )
 		return m_leds [0];
 	else
 		return Led_Off;
 }
 
 bool Zaurus::setLedState ( OLed which, OLedState st )
 {
 	static int fd = ::open ( "/dev/sharp_led", O_RDWR|O_NONBLOCK );
 
 	if ( which == Led_Mail ) {
 		if ( fd >= 0 ) {
 			struct sharp_led_status leds;
 			::memset ( &leds, 0, sizeof( leds ));
 			leds. which = SHARP_LED_MAIL_EXISTS;
 			bool ok = true;
 
 			switch ( st ) {
 				case Led_Off      : leds. status = LED_MAIL_NO_UNREAD_MAIL; break;
 				case Led_On       : leds. status = LED_MAIL_NEWMAIL_EXISTS; break;
 				case Led_BlinkSlow: leds. status = LED_MAIL_UNREAD_MAIL_EX; break;
 				default            : ok = false;
 			}
 
 			if ( ok && ( ::ioctl ( fd, SHARP_LED_SETSTATUS, &leds ) >= 0 )) {
 				m_leds [0] = st;
 				return true;
 			}
 		}
 	}
 	return false;
 }
 
 bool Zaurus::setSoftSuspend ( bool soft )
 {
 	bool res = false;
 	int fd;
 
 	if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) ||
         (( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) {
 
 		int sources = ::ioctl ( fd, APM_IOCGEVTSRC, 0 ); // get current event sources
 
 		if ( sources >= 0 ) {
 			if ( soft )
 				sources &= ~APM_EVT_POWER_BUTTON;
 			else
 				sources |= APM_EVT_POWER_BUTTON;
 
 			if ( ::ioctl ( fd, APM_IOCSEVTSRC, sources ) >= 0 ) // set new event sources
 				res = true;
 			else
 				perror ( "APM_IOCGEVTSRC" );
 		}
 		else
 			perror ( "APM_IOCGEVTSRC" );
 
 		::close ( fd );
 	}
 	else
 		perror ( "/dev/apm_bios or /dev/misc/apm_bios" );
 
     return res;
 }
 
 
 bool Zaurus::setDisplayBrightness ( int bright )
 {
 	bool res = false;
 	int fd;
 
 	if ( bright > 255 )
 		bright = 255;
 	if ( bright < 0 )
 		bright = 0;
 
 	if (( fd = ::open ( "/dev/fl", O_WRONLY )) >= 0 ) {
 		int bl = ( bright * 4 + 127 ) / 255; // only 4 steps on zaurus
 		if ( bright && !bl )
 			bl = 1;
 		res = ( ::ioctl ( fd, FL_IOCTL_STEP_CONTRAST, bl ) == 0 );
 		::close ( fd );
 	}
 	return res;
 }
 
 
 int Zaurus::displayBrightnessResolution ( ) const
 {
 	return 5;
 }