diff -urN gnokii/common/devices/unixbluetooth.c gnokii-mh/common/devices/unixbluetooth.c
--- gnokii/common/devices/unixbluetooth.c	Thu Jan  2 16:01:06 2003
+++ gnokii-mh/common/devices/unixbluetooth.c	Tue Feb 18 11:35:32 2003
@@ -42,7 +42,7 @@
 	"Nokia 8910"
 };
 
-int bluetooth_open(bdaddr_t *bdaddr, int channel, struct gn_statemachine *state)
+int bluetooth_open(bdaddr_t *bdaddr, uint8_t channel, struct gn_statemachine *state)
 {
 	struct sockaddr_rc laddr, raddr;
 	int fd;
@@ -64,7 +64,7 @@
 
 	raddr.rc_family = AF_BLUETOOTH;
 	bacpy(&raddr.rc_bdaddr, bdaddr);
-	raddr.rc_channel = htobs(channel);
+	raddr.rc_channel = channel;
 
 	if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
 		perror("Can't connect");
@@ -102,7 +102,7 @@
 
 #else /* HAVE_BLUETOOTH */
 
-int bluetooth_open(void *bdaddr, int channel, struct gn_statemachine *state) { return -1; }
+int bluetooth_open(void *bdaddr, uint8_t channel, struct gn_statemachine *state) { return -1; }
 int bluetooth_close(int fd, struct gn_statemachine *state) { return -1; }
 int bluetooth_write(int fd, const __ptr_t bytes, int size, struct gn_statemachine *state) { return -1; }
 int bluetooth_read(int fd, __ptr_t bytes, int size, struct gn_statemachine *state) { return -1; }
diff -urN gnokii/include/devices/unixbluetooth.h gnokii-mh/include/devices/unixbluetooth.h
--- gnokii/include/devices/unixbluetooth.h	Fri Dec 27 01:11:40 2002
+++ gnokii-mh/include/devices/unixbluetooth.h	Tue Feb 18 11:36:00 2003
@@ -44,7 +44,7 @@
 
 #include "misc.h"
 
-int bluetooth_open(bdaddr_t *bdaddr, int channel, struct gn_statemachine *state);
+int bluetooth_open(bdaddr_t *bdaddr, uint8_t channel, struct gn_statemachine *state);
 int bluetooth_close(int fd, struct gn_statemachine *state);
 int bluetooth_write(int fd, const __ptr_t bytes, int size, struct gn_statemachine *state);
 int bluetooth_read(int fd, __ptr_t bytes, int size, struct gn_statemachine *state);
diff -urN gnokii/include/gsm-data.h gnokii-mh/include/gsm-data.h
--- gnokii/include/gsm-data.h	Mon Feb 17 00:40:28 2003
+++ gnokii-mh/include/gsm-data.h	Tue Feb 18 11:34:00 2003
@@ -131,7 +131,7 @@
 	char connect_script[256];			/* Script to run when device connection established */
 	char disconnect_script[256];			/* Script to run when device connection closed */
 #ifdef HAVE_BLUETOOTH
-	int rfcomm_cn;					/* RFCOMM channel number to connect */
+	uint8_t rfcomm_cn;				/* RFCOMM channel number to connect */
 	bdaddr_t bt_address;				/* Bluetooth device address */
 #endif
 } gn_config;