summaryrefslogtreecommitdiffstats
path: root/src/mkii.c
diff options
context:
space:
mode:
authorPali Rohár <pali.rohar@gmail.com>2014-11-26 16:49:39 +0100
committerPali Rohár <pali.rohar@gmail.com>2014-11-26 16:49:39 +0100
commitbb90caec1be476ce4093e72029537c8ccd38f5b3 (patch)
treeb2f851519a6c80a2a9ebe98d389602cb2dfd4d31 /src/mkii.c
parentc86e130ab1af4b6161b2a71a2449d2e02109800f (diff)
download0xFFFF-bb90caec1be476ce4093e72029537c8ccd38f5b3.tar.bz2
all: Fix overflow in shift operators
Diffstat (limited to 'src/mkii.c')
-rw-r--r--src/mkii.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mkii.c b/src/mkii.c
index 5030a89..e2fb23f 100644
--- a/src/mkii.c
+++ b/src/mkii.c
@@ -145,7 +145,7 @@ int mkii_init(struct usb_device_info * dev) {
}
type = image_type_from_string(ptr);
if ( type != IMAGE_UNKNOWN ) {
- dev->data |= (1 << type);
+ dev->data |= (1UL << type);
printf(" %s", ptr);
}
ptr = newptr;
@@ -156,9 +156,9 @@ int mkii_init(struct usb_device_info * dev) {
memset(buf, 0, sizeof(buf));
usb_get_string_simple(dev->udev, usb_device(dev->udev)->config[dev->flash_device->configuration].iConfiguration, buf, sizeof(buf));
if ( strncmp(buf, "Firmware Upgrade Configuration", sizeof("Firmware Upgrade Configuration")) == 0 )
- dev->data |= (1 << 31);
+ dev->data |= (1UL << 31);
- printf("Mode: %s\n", (dev->data & (1<<31)) ? "Update" : "PC Suite");
+ printf("Mode: %s\n", (dev->data & (1UL << 31)) ? "Update" : "PC Suite");
return 0;
@@ -198,7 +198,7 @@ int mkii_flash_image(struct usb_device_info * dev, struct image * image) {
ERROR("Not implemented yet");
return -1;
- if ( ! ( dev->data & (1 << image->type) ) ) {
+ if ( ! ( dev->data & (1UL << image->type) ) ) {
ERROR("Flashing image %s is not supported in current device configuration", image_type_to_string(image->type));
return -1;
}