summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsakumisu <[email protected]>2024-03-28 20:46:51 +0800
committersakumisu <[email protected]>2024-03-29 15:31:29 +0800
commita6d539792f0985db4f1531239a071e458b20efe1 (patch)
tree1c95ea0136cec4ebe3dc96fccd737c2109536104
parent7b5d8f29d4f9ad48f2da1e948f8017bcdd2609f7 (diff)
release v1.2.0v1.2.0
-rw-r--r--VERSION2
-rw-r--r--cherryusb_config_template.h4
-rw-r--r--docs/source/api/api_host.rst19
-rw-r--r--docs/source/conf.py4
4 files changed, 9 insertions, 20 deletions
diff --git a/VERSION b/VERSION
index 63c8a3f6..12fd337f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,5 +1,5 @@
VERSION_MAJOR = 1
-VERSION_MINOR = 1
+VERSION_MINOR = 2
PATCHLEVEL = 99
VERSION_TWEAK = 0
EXTRAVERSION = 0
diff --git a/cherryusb_config_template.h b/cherryusb_config_template.h
index eff54194..713db692 100644
--- a/cherryusb_config_template.h
+++ b/cherryusb_config_template.h
@@ -6,8 +6,8 @@
#ifndef CHERRYUSB_CONFIG_H
#define CHERRYUSB_CONFIG_H
-#define CHERRYUSB_VERSION 0x010100
-#define CHERRYUSB_VERSION_STR "v1.1.0"
+#define CHERRYUSB_VERSION 0x010200
+#define CHERRYUSB_VERSION_STR "v1.2.0"
/* ================ USB common Configuration ================ */
diff --git a/docs/source/api/api_host.rst b/docs/source/api/api_host.rst
index 92274922..1378df87 100644
--- a/docs/source/api/api_host.rst
+++ b/docs/source/api/api_host.rst
@@ -111,19 +111,6 @@ hub 结构体
uint8_t *int_buffer;
};
-usbh_alloc_bus
-""""""""""""""""""""""""""""""""""""
-
-``usbh_alloc_bus`` 用于创建一个 bus,并且根据 reg_base 分配一个 hcd
-
-.. code-block:: C
-
- struct usbh_bus *usbh_alloc_bus(uint8_t busid, uint32_t reg_base);
-
-- **busid** bus id,从 0开始,不能超过 `CONFIG_USBHOST_MAX_BUS`
-- **reg_base** hcd 寄存器基地址
-- 返回 bus 句柄
-
usbh_initialize
""""""""""""""""""""""""""""""""""""
@@ -131,9 +118,11 @@ usbh_initialize
.. code-block:: C
- int usbh_initialize(struct usbh_bus *bus);
+ int usbh_initialize(uint8_t busid, uint32_t reg_base);
-- **bus** bus 句柄
+- **busid** bus id,从 0开始,不能超过 `CONFIG_USBHOST_MAX_BUS`
+- **reg_base** hcd 寄存器基地址
+- **return** 0 表示正常其他表示错误
usbh_find_class_instance
""""""""""""""""""""""""""""""""""""
diff --git a/docs/source/conf.py b/docs/source/conf.py
index dfacf143..6b35bd40 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -6,8 +6,8 @@ project = 'CherryUSB'
copyright = '2024, sakumisu'
author = 'sakumisu'
-release = '1.1.0'
-version = '1.1.0'
+release = '1.2.0'
+version = '1.2.0'
# -- General configuration