projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto-detect windows signing stuff
[fw/altos]
/
libaltos
/
libaltos_windows.c
diff --git
a/libaltos/libaltos_windows.c
b/libaltos/libaltos_windows.c
index 43e347c40cb70ce96bb0bbf9dd19875a6e551881..f91859ac51e7e3859863965ccaa4b48958f7f5e4 100644
(file)
--- a/
libaltos/libaltos_windows.c
+++ b/
libaltos/libaltos_windows.c
@@
-59,12
+59,12
@@
log_message(char *fmt, ...)
char buffer[4096];
GetLocalTime(&time);
char buffer[4096];
GetLocalTime(&time);
- sprintf (buffer, "%4d-%02d-%02d %2d:%02d:%02d. ",
+
__ms_
sprintf (buffer, "%4d-%02d-%02d %2d:%02d:%02d. ",
time.wYear, time.wMonth, time.wDay,
time.wHour, time.wMinute, time.wSecond);
va_start(a, fmt);
time.wYear, time.wMonth, time.wDay,
time.wHour, time.wMinute, time.wSecond);
va_start(a, fmt);
- vsprintf(buffer + strlen(buffer), fmt, a);
+
__ms_
vsprintf(buffer + strlen(buffer), fmt, a);
va_end(a);
fputs(buffer, log);
va_end(a);
fputs(buffer, log);
@@
-188,11
+188,11
@@
altos_list_next(struct altos_list *list, struct altos_device *device)
if (result != 0) {
altos_set_last_windows_error();
} else {
if (result != 0) {
altos_set_last_windows_error();
} else {
- sscanf((char *) symbolic + sizeof("\\??\\USB#VID_") - 1,
+
__ms_
sscanf((char *) symbolic + sizeof("\\??\\USB#VID_") - 1,
"%04X", &vid);
"%04X", &vid);
- sscanf((char *) symbolic + sizeof("\\??\\USB#VID_XXXX&PID_") - 1,
+
__ms_
sscanf((char *) symbolic + sizeof("\\??\\USB#VID_XXXX&PID_") - 1,
"%04X", &pid);
"%04X", &pid);
- sscanf((char *) symbolic + sizeof("\\??\\USB#VID_XXXX&PID_XXXX#") - 1,
+
__ms_
sscanf((char *) symbolic + sizeof("\\??\\USB#VID_XXXX&PID_XXXX#") - 1,
"%d", &serial);
}
if (vid == 0 || pid == 0 || serial == 0) {
"%d", &serial);
}
if (vid == 0 || pid == 0 || serial == 0) {
@@
-201,11
+201,11
@@
altos_list_next(struct altos_list *list, struct altos_device *device)
instanceid,
sizeof (instanceid),
&instanceid_len)) {
instanceid,
sizeof (instanceid),
&instanceid_len)) {
- sscanf((char *) instanceid + sizeof("USB\\VID_") - 1,
+
__ms_
sscanf((char *) instanceid + sizeof("USB\\VID_") - 1,
"%04X", &vid);
"%04X", &vid);
- sscanf((char *) instanceid + sizeof("USB\\VID_XXXX&PID_") - 1,
+
__ms_
sscanf((char *) instanceid + sizeof("USB\\VID_XXXX&PID_") - 1,
"%04X", &pid);
"%04X", &pid);
- sscanf((char *) instanceid + sizeof("USB\\VID_XXXX&PID_XXXX\\") - 1,
+
__ms_
sscanf((char *) instanceid + sizeof("USB\\VID_XXXX&PID_XXXX\\") - 1,
"%d", &serial);
} else {
altos_set_last_windows_error();
"%d", &serial);
} else {
altos_set_last_windows_error();
@@
-667,7
+667,7
@@
static void
ba2str(BTH_ADDR ba, char *str)
{
ba2str(BTH_ADDR ba, char *str)
{
- sprintf(str, "%02X:%02X:%02X:%02X:%02X:%02X",
+
__ms_
sprintf(str, "%02X:%02X:%02X:%02X:%02X:%02X",
get_byte(ba, 0),
get_byte(ba, 1),
get_byte(ba, 2),
get_byte(ba, 0),
get_byte(ba, 1),
get_byte(ba, 2),
@@
-681,7
+681,7
@@
str2ba(char *str)
{
unsigned int bytes[6];
{
unsigned int bytes[6];
- sscanf(str, "%02x:%02x:%02x:%02x:%02x:%02x",
+
__ms_
sscanf(str, "%02x:%02x:%02x:%02x:%02x:%02x",
&bytes[0],
&bytes[1],
&bytes[2],
&bytes[0],
&bytes[1],
&bytes[2],
@@
-757,6
+757,7
@@
altos_bt_open(struct altos_bt_device *device)
struct altos_file_windows *file;
SOCKADDR_BTH sockaddr_bth;
int ret;
struct altos_file_windows *file;
SOCKADDR_BTH sockaddr_bth;
int ret;
+ int channel = 0;
file = calloc(1, sizeof (struct altos_file_windows));
if (!file) {
file = calloc(1, sizeof (struct altos_file_windows));
if (!file) {
@@
-775,7
+776,12
@@
altos_bt_open(struct altos_bt_device *device)
memset(&sockaddr_bth, '\0', sizeof (sockaddr_bth));
sockaddr_bth.addressFamily = AF_BTH;
sockaddr_bth.btAddr = str2ba(device->addr);
memset(&sockaddr_bth, '\0', sizeof (sockaddr_bth));
sockaddr_bth.addressFamily = AF_BTH;
sockaddr_bth.btAddr = str2ba(device->addr);
- sockaddr_bth.port = altos_bt_port(device);
+
+ channel = altos_bt_port(device);
+ if (channel == 0)
+ channel = BT_PORT_DEFAULT;
+
+ sockaddr_bth.port = channel;
ret = connect(file->socket, (SOCKADDR *) &sockaddr_bth, sizeof (sockaddr_bth));
ret = connect(file->socket, (SOCKADDR *) &sockaddr_bth, sizeof (sockaddr_bth));