From d0caaadaeea48e8f76dca3125a2dea3465a58416 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sun, 7 Dec 2014 17:03:47 +0000
Subject: [PATCH] stmhal: Allow network, uselect, usocket mods to be used by
other ports.
Remove include of stm32f4xx_hal.h, replace by include of MICROPY_HAL_H
where needed, and make it compile without float support. This makes
these 3 modules much more generic and usable by other ports.
---
stmhal/modnetwork.c | 2 --
stmhal/moduselect.c | 3 +--
stmhal/modusocket.c | 6 ++++--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/stmhal/modnetwork.c b/stmhal/modnetwork.c
index e4d0fcdf9..21e279a99 100644
--- a/stmhal/modnetwork.c
+++ b/stmhal/modnetwork.c
@@ -29,8 +29,6 @@
#include <string.h>
#include <errno.h>
-#include "stm32f4xx_hal.h"
-
#include "mpconfig.h"
#include "nlr.h"
#include "misc.h"
diff --git a/stmhal/moduselect.c b/stmhal/moduselect.c
index 0d5d6dd4a..b354e486e 100644
--- a/stmhal/moduselect.c
+++ b/stmhal/moduselect.c
@@ -28,8 +28,6 @@
#include <stdio.h>
#include <errno.h>
-#include "stm32f4xx_hal.h"
-
#include "mpconfig.h"
#include "misc.h"
#include "nlr.h"
@@ -37,6 +35,7 @@
#include "obj.h"
#include "objlist.h"
#include "pybioctl.h"
+#include MICROPY_HAL_H
/// \module select - Provides select function to wait for events on a stream
///
diff --git a/stmhal/modusocket.c b/stmhal/modusocket.c
index d705636c1..c2246b3c4 100644
--- a/stmhal/modusocket.c
+++ b/stmhal/modusocket.c
@@ -29,8 +29,6 @@
#include <string.h>
#include <errno.h>
-#include "stm32f4xx_hal.h"
-
#include "mpconfig.h"
#include "nlr.h"
#include "misc.h"
@@ -321,7 +319,11 @@ STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
if (timeout_in == mp_const_none) {
timeout = -1;
} else {
+ #if MICROPY_PY_BUILTIN_FLOAT
timeout = 1000 * mp_obj_get_float(timeout_in);
+ #else
+ timeout = 1000 * mp_obj_get_int(timeout_in);
+ #endif
}
int _errno;
if (self->nic_type->settimeout(self, timeout, &_errno) != 0) {
--
GitLab