diff -urN gnokii/configure.in gnokii-mh/configure.in --- gnokii/configure.in Fri Apr 25 15:56:54 2003 +++ gnokii-mh/configure.in Mon Apr 28 15:50:38 2003 @@ -229,10 +229,8 @@ if test $ac_cv_have_sockaddr_rc = yes; then AC_DEFINE(HAVE_BLUETOOTH) USE_BLUETOOTH="yes" - HAVE_BLUETOOTH_EXP="1" LIBS="$LIBS -lbluetooth" else - HAVE_BLUETOOTH_EXP="0" USE_BLUETOOTH="no" fi @@ -515,8 +513,6 @@ AC_SUBST(HAVE_XGNOKII) AC_SUBST(WIN32) -AC_SUBST(HAVE_BLUETOOTH_EXP) - AC_OUTPUT( Makefile.global po/Makefile.in @@ -524,7 +520,6 @@ packaging/RedHat/gnokii.spec packaging/Slackware/SlackBuild common/gnokii.pc - include/gnokii/data.h ) diff -urN gnokii/include/gnokii/data.h gnokii-mh/include/gnokii/data.h --- gnokii/include/gnokii/data.h Thu Jan 1 01:00:00 1970 +++ gnokii-mh/include/gnokii/data.h Mon Apr 28 15:45:16 2003 @@ -0,0 +1,228 @@ +/* + + $Id: data.h.in,v 1.65 2003/04/28 12:48:46 pkot Exp $ + + G N O K I I + + A Linux/Unix toolset and driver for Nokia mobile phones. + + This file is part of gnokii. + + Gnokii is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + Gnokii is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with gnokii; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + Copyright (C) 1999, 2000 Hugh Blemings & Pavel Janík ml. + +*/ + +#ifndef _gnokii_data_h +#define _gnokii_data_h + +#include +#include +#include +#include +#include + +/* For models table */ +typedef struct { + char *model; + char *number; + int flags; +} gn_phone_model; + +/* This is a generic holder for high level information - eg a gn_bmp */ +typedef struct { + gn_sms_folder *sms_folder; + gn_sms_folder_list *sms_folder_list; + gn_sms_raw *raw_sms; /* This is for phone driver, application using libgnokii should not touch this */ + gn_sms *sms; /* This is for user communication, phone driver should not have to touch this one */ + gn_phonebook_entry *phonebook_entry; + gn_speed_dial *speed_dial; + gn_memory_status *memory_status; + gn_sms_message_list *message_list[GN_SMS_MESSAGE_MAX_NUMBER][GN_SMS_FOLDER_MAX_NUMBER]; + gn_sms_status *sms_status; + gn_sms_folder_stats *folder_stats[GN_SMS_FOLDER_MAX_NUMBER]; + gn_sms_message_center *message_center; + char *imei; + char *revision; + char *model; + char *manufacturer; + gn_network_info *network_info; + gn_wap_bookmark *wap_bookmark; + gn_wap_setting *wap_setting; + gn_todo *todo; + gn_todo_list *todo_list; + gn_calnote *calnote; + gn_calnote_list *calnote_list; + gn_bmp *bitmap; + gn_ringtone *ringtone; + gn_profile *profile; + gn_battery_unit *battery_unit; + float *battery_level; + gn_rf_unit *rf_unit; + float *rf_level; + gn_display_output *display_output; + char *incoming_call_nr; + gn_power_source *power_source; + gn_timestamp *datetime; + gn_calnote_alarm *alarm; + gn_raw_data *raw_data; + gn_call_divert *call_divert; + gn_error (*on_sms)(gn_sms *message); + int *display_status; + void (*on_cell_broadcast)(gn_cb_message *message); + gn_netmonitor *netmonitor; + gn_call_info *call_info; + void (*call_notification)(gn_call_status call_status, gn_call_info *call_info, + struct gn_statemachine *state); + gn_rlp_f96_frame *rlp_frame; + int rlp_out_dtx; + void (*rlp_rx_callback)(gn_rlp_f96_frame *frame); + gn_security_code *security_code; + const char *dtmf_string; + unsigned char reset_type; + gn_key_code key_code; + unsigned char character; + gn_phone_model *phone; + gn_locks_info *locks_info; +} gn_data; + +/* + * A structure to hold information about the particular link + * The link comes 'under' the phone + */ +typedef struct { + /* A regularly called loop function. Timeout can be used to make the + * function block or not */ + gn_error (*loop)(struct timeval *timeout, struct gn_statemachine *state); + /* A pointer to the function used to send out a message. This is used + * by the phone specific code to send a message over the link */ + gn_error (*send_message)(unsigned int messagesize, unsigned char messagetype, unsigned char *message, + struct gn_statemachine *state); + void *link_instance; +} gn_link; + +typedef struct { + char model[GN_MODEL_MAX_LENGTH]; /* Phone model */ + char port_device[GN_DEVICE_NAME_MAX_LENGTH]; /* Port device to use (e.g. /dev/ttyS0) */ + gn_connection_type connection_type; /* Connection type (e.g. serial, ir) */ + int init_length; /* Number of chars sent to sync the serial port */ + int serial_baudrate; /* Baud rate to use */ + int serial_write_usleep; /* Inter character delay or <0 to disable */ + int hardware_handshake; /* Select between hardware and software handshake */ + int require_dcd; /* DCD signal check */ + int smsc_timeout; /* How many seconds should we wait for the SMSC response, defaults to 10 seconds */ + char connect_script[256]; /* Script to run when device connection established */ + char disconnect_script[256]; /* Script to run when device connection closed */ + uint8_t rfcomm_cn; /* RFCOMM channel number to connect */ +} gn_config; + +typedef struct { + int fd; + gn_connection_type type; + void *device_instance; +} gn_device; + +typedef enum { + GN_OP_Init, + GN_OP_Terminate, + GN_OP_GetModel, + GN_OP_GetRevision, + GN_OP_GetImei, + GN_OP_GetManufacturer, + GN_OP_Identify, + GN_OP_GetBitmap, + GN_OP_SetBitmap, + GN_OP_GetBatteryLevel, + GN_OP_GetRFLevel, + GN_OP_DisplayOutput, + GN_OP_GetMemoryStatus, + GN_OP_ReadPhonebook, + GN_OP_WritePhonebook, + GN_OP_GetPowersource, + GN_OP_GetAlarm, + GN_OP_GetSMSStatus, + GN_OP_GetIncomingCallNr, + GN_OP_GetNetworkInfo, + GN_OP_GetSecurityCode, + GN_OP_CreateSMSFolder, + GN_OP_DeleteSMSFolder, + GN_OP_GetSMS, + GN_OP_GetSMSnoValidate, + GN_OP_GetSMSFolders, + GN_OP_GetSMSFolderStatus, + GN_OP_GetIncomingSMS, + GN_OP_GetUnreadMessages, + GN_OP_GetNextSMS, + GN_OP_DeleteSMSnoValidate, + GN_OP_DeleteSMS, + GN_OP_SendSMS, + GN_OP_GetSpeedDial, + GN_OP_GetSMSCenter, + GN_OP_SetSMSCenter, + GN_OP_GetDateTime, + GN_OP_GetToDo, + GN_OP_GetCalendarNote, + GN_OP_CallDivert, + GN_OP_OnSMS, + GN_OP_PollSMS, + GN_OP_SetAlarm, + GN_OP_SetDateTime, + GN_OP_GetProfile, + GN_OP_SetProfile, + GN_OP_WriteToDo, + GN_OP_DeleteAllToDos, + GN_OP_WriteCalendarNote, + GN_OP_DeleteCalendarNote, + GN_OP_SetSpeedDial, + GN_OP_GetDisplayStatus, + GN_OP_PollDisplay, + GN_OP_SaveSMS, + GN_OP_SetCellBroadcast, + GN_OP_NetMonitor, + GN_OP_MakeCall, + GN_OP_AnswerCall, + GN_OP_CancelCall, + GN_OP_SetCallNotification, + GN_OP_SendRLPFrame, + GN_OP_SetRLPRXCallback, + GN_OP_EnterSecurityCode, + GN_OP_GetSecurityCodeStatus, + GN_OP_ChangeSecurityCode, + GN_OP_SendDTMF, + GN_OP_Reset, + GN_OP_GetRingtone, + GN_OP_SetRingtone, + GN_OP_GetRawRingtone, + GN_OP_SetRawRingtone, + GN_OP_PressPhoneKey, + GN_OP_ReleasePhoneKey, + GN_OP_EnterChar, + GN_OP_Subscribe, + GN_OP_GetWAPBookmark, + GN_OP_WriteWAPBookmark, + GN_OP_DeleteWAPBookmark, + GN_OP_GetWAPSetting, + GN_OP_ActivateWAPSetting, + GN_OP_WriteWAPSetting, + GN_OP_GetLocksInfo, + GN_OP_Max, /* don't append anything after this entry */ +} gn_operation; + +/* Undefined functions in fbus/mbus files */ +extern gn_error gn_unimplemented(void); +#define GN_UNIMPLEMENTED (void *) gn_unimplemented + +#endif /* _gnokii_data_h */ diff -urN gnokii/include/gnokii/data.h.in gnokii-mh/include/gnokii/data.h.in --- gnokii/include/gnokii/data.h.in Mon Apr 28 15:00:07 2003 +++ gnokii-mh/include/gnokii/data.h.in Thu Jan 1 01:00:00 1970 @@ -1,228 +0,0 @@ -/* - - $Id: data.h.in,v 1.65 2003/04/28 12:48:46 pkot Exp $ - - G N O K I I - - A Linux/Unix toolset and driver for Nokia mobile phones. - - This file is part of gnokii. - - Gnokii is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Gnokii is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with gnokii; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Copyright (C) 1999, 2000 Hugh Blemings & Pavel Janík ml. - -*/ - -#ifndef _gnokii_data_h -#define _gnokii_data_h - -#include -#include -#include -#include -#include - -/* For models table */ -typedef struct { - char *model; - char *number; - int flags; -} gn_phone_model; - -/* This is a generic holder for high level information - eg a gn_bmp */ -typedef struct { - gn_sms_folder *sms_folder; - gn_sms_folder_list *sms_folder_list; - gn_sms_raw *raw_sms; /* This is for phone driver, application using libgnokii should not touch this */ - gn_sms *sms; /* This is for user communication, phone driver should not have to touch this one */ - gn_phonebook_entry *phonebook_entry; - gn_speed_dial *speed_dial; - gn_memory_status *memory_status; - gn_sms_message_list *message_list[GN_SMS_MESSAGE_MAX_NUMBER][GN_SMS_FOLDER_MAX_NUMBER]; - gn_sms_status *sms_status; - gn_sms_folder_stats *folder_stats[GN_SMS_FOLDER_MAX_NUMBER]; - gn_sms_message_center *message_center; - char *imei; - char *revision; - char *model; - char *manufacturer; - gn_network_info *network_info; - gn_wap_bookmark *wap_bookmark; - gn_wap_setting *wap_setting; - gn_todo *todo; - gn_todo_list *todo_list; - gn_calnote *calnote; - gn_calnote_list *calnote_list; - gn_bmp *bitmap; - gn_ringtone *ringtone; - gn_profile *profile; - gn_battery_unit *battery_unit; - float *battery_level; - gn_rf_unit *rf_unit; - float *rf_level; - gn_display_output *display_output; - char *incoming_call_nr; - gn_power_source *power_source; - gn_timestamp *datetime; - gn_calnote_alarm *alarm; - gn_raw_data *raw_data; - gn_call_divert *call_divert; - gn_error (*on_sms)(gn_sms *message); - int *display_status; - void (*on_cell_broadcast)(gn_cb_message *message); - gn_netmonitor *netmonitor; - gn_call_info *call_info; - void (*call_notification)(gn_call_status call_status, gn_call_info *call_info, - struct gn_statemachine *state); - gn_rlp_f96_frame *rlp_frame; - int rlp_out_dtx; - void (*rlp_rx_callback)(gn_rlp_f96_frame *frame); - gn_security_code *security_code; - const char *dtmf_string; - unsigned char reset_type; - gn_key_code key_code; - unsigned char character; - gn_phone_model *phone; - gn_locks_info *locks_info; -} gn_data; - -/* - * A structure to hold information about the particular link - * The link comes 'under' the phone - */ -typedef struct { - /* A regularly called loop function. Timeout can be used to make the - * function block or not */ - gn_error (*loop)(struct timeval *timeout, struct gn_statemachine *state); - /* A pointer to the function used to send out a message. This is used - * by the phone specific code to send a message over the link */ - gn_error (*send_message)(unsigned int messagesize, unsigned char messagetype, unsigned char *message, - struct gn_statemachine *state); - void *link_instance; -} gn_link; - -typedef struct { - char model[GN_MODEL_MAX_LENGTH]; /* Phone model */ - char port_device[GN_DEVICE_NAME_MAX_LENGTH]; /* Port device to use (e.g. /dev/ttyS0) */ - gn_connection_type connection_type; /* Connection type (e.g. serial, ir) */ - int init_length; /* Number of chars sent to sync the serial port */ - int serial_baudrate; /* Baud rate to use */ - int serial_write_usleep; /* Inter character delay or <0 to disable */ - int hardware_handshake; /* Select between hardware and software handshake */ - int require_dcd; /* DCD signal check */ - int smsc_timeout; /* How many seconds should we wait for the SMSC response, defaults to 10 seconds */ - char connect_script[256]; /* Script to run when device connection established */ - char disconnect_script[256]; /* Script to run when device connection closed */ - uint8_t rfcomm_cn; /* RFCOMM channel number to connect */ -} gn_config; - -typedef struct { - int fd; - gn_connection_type type; - void *device_instance; -} gn_device; - -typedef enum { - GN_OP_Init, - GN_OP_Terminate, - GN_OP_GetModel, - GN_OP_GetRevision, - GN_OP_GetImei, - GN_OP_GetManufacturer, - GN_OP_Identify, - GN_OP_GetBitmap, - GN_OP_SetBitmap, - GN_OP_GetBatteryLevel, - GN_OP_GetRFLevel, - GN_OP_DisplayOutput, - GN_OP_GetMemoryStatus, - GN_OP_ReadPhonebook, - GN_OP_WritePhonebook, - GN_OP_GetPowersource, - GN_OP_GetAlarm, - GN_OP_GetSMSStatus, - GN_OP_GetIncomingCallNr, - GN_OP_GetNetworkInfo, - GN_OP_GetSecurityCode, - GN_OP_CreateSMSFolder, - GN_OP_DeleteSMSFolder, - GN_OP_GetSMS, - GN_OP_GetSMSnoValidate, - GN_OP_GetSMSFolders, - GN_OP_GetSMSFolderStatus, - GN_OP_GetIncomingSMS, - GN_OP_GetUnreadMessages, - GN_OP_GetNextSMS, - GN_OP_DeleteSMSnoValidate, - GN_OP_DeleteSMS, - GN_OP_SendSMS, - GN_OP_GetSpeedDial, - GN_OP_GetSMSCenter, - GN_OP_SetSMSCenter, - GN_OP_GetDateTime, - GN_OP_GetToDo, - GN_OP_GetCalendarNote, - GN_OP_CallDivert, - GN_OP_OnSMS, - GN_OP_PollSMS, - GN_OP_SetAlarm, - GN_OP_SetDateTime, - GN_OP_GetProfile, - GN_OP_SetProfile, - GN_OP_WriteToDo, - GN_OP_DeleteAllToDos, - GN_OP_WriteCalendarNote, - GN_OP_DeleteCalendarNote, - GN_OP_SetSpeedDial, - GN_OP_GetDisplayStatus, - GN_OP_PollDisplay, - GN_OP_SaveSMS, - GN_OP_SetCellBroadcast, - GN_OP_NetMonitor, - GN_OP_MakeCall, - GN_OP_AnswerCall, - GN_OP_CancelCall, - GN_OP_SetCallNotification, - GN_OP_SendRLPFrame, - GN_OP_SetRLPRXCallback, - GN_OP_EnterSecurityCode, - GN_OP_GetSecurityCodeStatus, - GN_OP_ChangeSecurityCode, - GN_OP_SendDTMF, - GN_OP_Reset, - GN_OP_GetRingtone, - GN_OP_SetRingtone, - GN_OP_GetRawRingtone, - GN_OP_SetRawRingtone, - GN_OP_PressPhoneKey, - GN_OP_ReleasePhoneKey, - GN_OP_EnterChar, - GN_OP_Subscribe, - GN_OP_GetWAPBookmark, - GN_OP_WriteWAPBookmark, - GN_OP_DeleteWAPBookmark, - GN_OP_GetWAPSetting, - GN_OP_ActivateWAPSetting, - GN_OP_WriteWAPSetting, - GN_OP_GetLocksInfo, - GN_OP_Max, /* don't append anything after this entry */ -} gn_operation; - -/* Undefined functions in fbus/mbus files */ -extern gn_error gn_unimplemented(void); -#define GN_UNIMPLEMENTED (void *) gn_unimplemented - -#endif /* _gnokii_data_h */