-rw-r--r-- | library/custom-sharp.h | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/library/custom-sharp.h b/library/custom-sharp.h index f65d474..08f8a6f 100644 --- a/library/custom-sharp.h +++ b/library/custom-sharp.h @@ -34,17 +34,17 @@ #include <stdio.h> #include <signal.h> #include <fcntl.h> #include <sys/ioctl.h> #define SHARP_DEV_IOCTL_COMMAND_START 0x5680 /* --- for SHARP_BUZZER device --- */ -#define SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) +#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 */ @@ -65,16 +65,19 @@ #define CUSTOM_BUZZER( sound ) \ { \ static int fd = open( "/dev/sharp_buz", O_RDWR|O_NONBLOCK ); \ ioctl( fd, SHARP_BUZZER_MAKESOUND, sound ); \ } #define CUSTOM_SOUND_ALARM CUSTOM_BUZZER( SHARP_BUZ_SCHEDULE_ALARM ) +#define CUSTOM_SOUND_KEYCLICK CUSTOM_BUZZER( SHARP_BUZ_KEYSOUND ) +#define CUSTOM_SOUND_TOUCH CUSTOM_BUZZER( SHARP_BUZ_TOUCHSOUND ) + #include <sys/ioctl.h> #include <asm/sharp_char.h> // a bit awkward, as this value is defined in emailclient.cpp aswell... #define LED_MAIL 0 #define SHARP_LED_MAIL 9 @@ -92,56 +95,56 @@ #define QPE_HAVE_MEMALERTER #define QPE_MEMALERTER_IMPL \ static void sig_handler(int sig) \ { \ switch (sig) { \ case SIGHUP: \ - memstate = VeryLow; \ - break; \ + memstate = VeryLow; \ + break; \ case SIGUSR1: \ - memstate = Normal; \ - break; \ + memstate = Normal; \ + break; \ case SIGUSR2: \ - memstate = Low; \ - break; \ + memstate = Low; \ + break; \ } \ } \ static void initMemalerter() \ { \ struct sigaction sa; \ memset(&sa, '\0', sizeof sa); \ sa.sa_handler = sig_handler; \ sa.sa_flags = SA_RESTART; \ if (sigaction(SIGHUP, &sa, NULL) < 0) { \ - return; \ + return; \ } \ if (sigaction(SIGUSR1, &sa, NULL) < 0) { \ - return; \ + return; \ } \ if (sigaction(SIGUSR2, &sa, NULL) < 0) { \ - return; \ + return; \ } \ FILE *fo = fopen("/proc/sys/vm/freepg_signal_proc", "w"); \ \ if (!fo) \ return; \ fprintf(fo, "qpe\n"); \ fclose(fo); \ } #define QPE_INITIAL_NUMLOCK_STATE \ { \ bool numLock = FALSE; \ sharp_kbdctl_modifstat st; \ int dev = ::open("/dev/sharp_kbdctl", O_RDWR); \ if( dev >= 0 ) { \ - memset(&st, 0, sizeof(st)); \ - st.which = 3; \ + memset(&st, 0, sizeof(st)); \ + st.which = 3; \ int ret = ioctl(dev, SHARP_KBDCTL_GETMODIFSTAT, (char*)&st); \ - if( !ret ) \ - numLock = (bool)st.stat; \ - ::close(dev); \ + if( !ret ) \ + numLock = (bool)st.stat; \ + ::close(dev); \ } \ return numLock; \ } |