Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
decoder: Fix bit_position swapping
[apps/agl-service-can-low-level.git]
/
low-can-binding
/
utils
/
socketcan.hpp
diff --git
a/low-can-binding/utils/socketcan.hpp
b/low-can-binding/utils/socketcan.hpp
index
2a7077e
..
17cec01
100644
(file)
--- a/
low-can-binding/utils/socketcan.hpp
+++ b/
low-can-binding/utils/socketcan.hpp
@@
-1,7
+1,7
@@
#pragma once
/*
#pragma once
/*
- * Copyright (C) 2015, 2016 ,
2017 "IoT
.bzh"
+ * Copyright (C) 2015, 2016 ,
2017, 2018, 2019 "IoT\
.bzh"
* Author "Romain Forlot" <romain.forlot@iot.bzh>
* Author "Loïc Collignon" <loic.collignon@iot.bzh>
* Licensed under the Apache License, Version 2.0 (the "License");
* Author "Romain Forlot" <romain.forlot@iot.bzh>
* Author "Loïc Collignon" <loic.collignon@iot.bzh>
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-21,23
+21,14
@@
#include <sys/socket.h>
#include <linux/can/bcm.h>
#include <sys/socket.h>
#include <linux/can/bcm.h>
+#include <linux/sockios.h>
#include <string.h>
#include "../binding/low-can-hat.hpp"
#include "../can/message/can-message.hpp"
#define INVALID_SOCKET -1
#include <string.h>
#include "../binding/low-can-hat.hpp"
#include "../can/message/can-message.hpp"
#define INVALID_SOCKET -1
-
-/**
- * @enum socket_type
- * @brief The type of socket
- */
-enum class socket_type {
- BCM, ///< BCM - Socket BCM
- J1939_ADDR_CLAIM, ///< J1939 - Socket J1939
- J1939, ///< J1939 - Socket J1939
- INVALID
-};
+#define NO_CAN_ID 0xFFFFFFFFU
namespace utils
{
namespace utils
{
@@
-69,6
+60,4
@@
namespace utils
int bind(const struct sockaddr* addr, socklen_t len);
int connect(const struct sockaddr* addr, socklen_t len);
};
int bind(const struct sockaddr* addr, socklen_t len);
int connect(const struct sockaddr* addr, socklen_t len);
};
-
-
}
}