diff --git a/en/contribute/OpenHarmony-hdf-coding-guide.md b/en/contribute/OpenHarmony-hdf-coding-guide.md index e63cca63bec7351de9f2166fa2f362cfa38439ce..84deab62a8cea60e9cd9febfe50ab8df0b3dc2f7 100644 --- a/en/contribute/OpenHarmony-hdf-coding-guide.md +++ b/en/contribute/OpenHarmony-hdf-coding-guide.md @@ -139,10 +139,10 @@ The driver loading information required by the HDF comes from the driver device ```bash $openharmony_src_root/vendor/hisilicon/hispark_taurus/hdf_config # Directory for storing the kernel-mode configuration file. There are no user-mode configuration files. -$openharmony_src_root/vendor/hisilicon/Hi3516DV300/hdf_config/khdf # Directory for storing the kernel-mode configuration file. -$openharmony_src_root/vendor/hisilicon/Hi3516DV300/hdf_config/uhdf # Directory for storing the user-mode configuration file. -$openharmony_src_root/vendor/hisilicon/Hi3516DV300/hdf_config/khdf/device_info/device_info.hcs # Device description file of the kernel-mode driver. -$openharmony_src_root/vendor/hisilicon/Hi3516DV300/hdf_config/khdf/lcd/lcd_config.hcs # Private configuration file of the kernel-mode driver. +$openharmony_src_root/vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf # Directory for storing the kernel-mode configuration file. +$openharmony_src_root/vendor/hisilicon/hispark_taurus_standard/hdf_config/uhdf # Directory for storing the user-mode configuration file. +$openharmony_src_root/vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf/device_info/device_info.hcs # Device description file of the kernel-mode driver. +$openharmony_src_root/vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf/lcd/lcd_config.hcs # Private configuration file of the kernel-mode driver. ``` #### [Rule] Use existing configuration information and inherit existing configuration templates during driver configuration. @@ -373,9 +373,9 @@ If a driver has private configurations, you can add a driver configuration file [Example] ```bash -$openharmony_src_root/vendor/hisilicon/Hi3516DV300/hdf_config/khdf/sample/sample_config.hcs # Correct. The private configuration file is stored in the sample directory. +$openharmony_src_root/vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf/sample/sample_config.hcs # Correct. The private configuration file is stored in the sample directory. -$openharmony_src_root/vendor/hisilicon/Hi3516DV300/hdf_config/khdf/sample_config.hcs # Incorrect. The private configuration file is placed in the root directory. +$openharmony_src_root/vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf/sample_config.hcs # Incorrect. The private configuration file is placed in the root directory. ``` #### [Rule] Add the private configuration file of a driver to the hdf.hcs file in the hdf_config directory. diff --git a/en/device-dev/driver/driver-peripherals-audio-des.md b/en/device-dev/driver/driver-peripherals-audio-des.md index 6f66786fe60ddf8f603022b3bb9e49054605df4f..b8b5d25fb78b5aded9b13be33aaf3ba8d7ebef00 100644 --- a/en/device-dev/driver/driver-peripherals-audio-des.md +++ b/en/device-dev/driver/driver-peripherals-audio-des.md @@ -273,7 +273,7 @@ int32_t CodecDaiHwParams(const struct AudioCard *card, const struct AudioPcmHwPa #### Registering and Binding Codec to HDF -This process depends on the driver implementation mode of the HDF. For details, see [HDF](https://gitee.com/openharmony/docs/blob/master/en/device-dev/driver/driver-hdf.md). +This process depends on the driver implementation mode of the HDF. For details, see [HDF](https://gitee.com/openharmony/docs/blob/master/en/device-dev/driver/Readme-EN.md). Fill in the **g_codecDriverEntry** structure. Ensure that the value of **moduleName** is the same as that in **device_info.hcs**. Implement the pointers to the **Bind**, **Init**, and **Release** functions. @@ -335,7 +335,7 @@ Configure the driver node, loading sequence, and service name in the .hcs file. Path of the standard-system configuration file: -**vendor/hisilicon/Hi3516DV300/hdf_config/khdf/** +**vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf/** Path of the small-system configuration file: @@ -779,7 +779,7 @@ int32_t Tfa9879DaiHwParams(const struct AudioCard *card, const struct AudioPcmHw #### Registering and Binding Accessory to HDF -This process depends on the driver implementation mode of the HDF. For details, see [HDF](https://gitee.com/openharmony/docs/blob/master/en/device-dev/driver/driver-hdf.md). +This process depends on the driver implementation mode of the HDF. For details, see [HDF](https://gitee.com/openharmony/docs/blob/master/en/device-dev/driver/Readme-EN.md). Fill in the **g_tfa9879DriverEntry** structure. Ensure that the value of **moduleName** is the same as that in **device_info.hcs**. Implement the pointers to the **Bind**, **Init**, and **Release** functions. @@ -900,7 +900,7 @@ int32_t Hi3516DmaPointer(struct PlatformData *data, uint32_t *pointer); #### Registering and Binding Platform to HDF -This process depends on the driver implementation mode of the HDF. For details, see [HDF](https://gitee.com/openharmony/docs/blob/master/en/device-dev/driver/driver-hdf.md). +This process depends on the driver implementation mode of the HDF. For details, see [HDF](https://gitee.com/openharmony/docs/blob/master/en/device-dev/driver/Readme-EN.md). - Fill in the **g_platformDriverEntry** structure. - Ensure that the value of **moduleName** is the same as that in **device_info.hcs**. @@ -1064,7 +1064,7 @@ int32_t DaiStartup(const struct AudioCard *card, const struct DaiDevice *device) #### Registering and Binding DAI to HDF -This process depends on the driver implementation mode of the HDF. For details, see [HDF](https://gitee.com/openharmony/docs/blob/master/en/device-dev/driver/driver-hdf.md). +This process depends on the driver implementation mode of the HDF. For details, see [HDF](https://gitee.com/openharmony/docs/blob/master/en/device-dev/driver/Readme-EN.md). - Fill in the **g_daiDriverEntry** structure. - Ensure that the value of **moduleName** is the same as that in **device_info.hcs**. @@ -1215,7 +1215,7 @@ HCS Files and Directory ``` Standard system: -vendor/hisilicon/Hi3516DV300/ +vendor/hisilicon/hispark_taurus_standard/ └── hdf_config └── khdf ├── audio diff --git a/en/device-dev/get-code/gettools-acquire.md b/en/device-dev/get-code/gettools-acquire.md index c47f2c8f37a7704e2d74539d80dc9e47489ace04..20a3b4a94175786f864d4450e3b14b8e6722b634 100644 --- a/en/device-dev/get-code/gettools-acquire.md +++ b/en/device-dev/get-code/gettools-acquire.md @@ -156,7 +156,7 @@ Run the following script to start building for standard-system devices \(referen ./build.sh --product-name {product_name} --ccache ``` -**product\_name** indicates the platform supported by the current distribution, for example, Hi3516DV300 and rk3568. +**product\_name** indicates the platform supported by the current distribution, for example, hispark_taurus_standard and rk3568. Files generated during building are stored in the **out/{device_name}/** directory, and the generated image is stored in the **out/{device_name}/packages/phone/images/** directory. diff --git a/en/device-dev/porting/porting-linux-kernel.md b/en/device-dev/porting/porting-linux-kernel.md index 491355e6696898970d6ef3e3ca60445c32577e16..05b66768aa52ddc24b638cf88b2adbe8747c8b97 100644 --- a/en/device-dev/porting/porting-linux-kernel.md +++ b/en/device-dev/porting/porting-linux-kernel.md @@ -84,7 +84,7 @@ The following uses Raspberry Pi 3b \(BCM2837\) as an example to describe how to # Configure the build environment, and use clang provided by the project to build the Raspberry Pi kernel source code. export PATH=$PROJ_ROOT/prebuilts/clang/ohos/linux-x86_64/llvm/bin:$PROJ_ROOT/prebuilts/gcc/linux-x86/arm/gcc-linaro-7.5.0-arm-linux-gnueabi/bin/:$PATH export MAKE_OPTIONS="ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- CC=clang HOSTCC=clang" - export PRODUCT_PATH=vendor/hisilicon/Hi3516DV300 + export PRODUCT_PATH=vendor/hisilicon/hispark_taurus_standard ``` 3. Comment out the flags that cannot be recognized by **clang**. diff --git a/en/device-dev/quick-start/quickstart-lite-reference.md b/en/device-dev/quick-start/quickstart-lite-reference.md index c6fa6d023fbb1468e99b3c2ad2274ec64b5799bf..0e30c40ca5c64cd0c1d2cae5ca47c50101e6c4c9 100644 --- a/en/device-dev/quick-start/quickstart-lite-reference.md +++ b/en/device-dev/quick-start/quickstart-lite-reference.md @@ -11,7 +11,7 @@ ``` > ![icon-note.gif](public_sys-resources/icon-note.gif) **NOTE** - > _name_ indicates the product name, for example, **Hi3516D V300** and **rk3568**. + > _name_ indicates the product name, for example, **hispark_taurus_standard** and **rk3568**. 2. Check the build result. After the build is complete, the following information is displayed in the log: diff --git a/en/device-dev/quick-start/quickstart-standard-reference.md b/en/device-dev/quick-start/quickstart-standard-reference.md index 2c20ea41430d7201815a82058950a99f53847d28..ada4dac3c77729838792875bc4e1c61f603be0cb 100644 --- a/en/device-dev/quick-start/quickstart-standard-reference.md +++ b/en/device-dev/quick-start/quickstart-standard-reference.md @@ -11,7 +11,7 @@ ``` > ![icon-note.gif](public_sys-resources/icon-note.gif) **NOTE** - > _name_ indicates the product name, for example, **Hi3516D V300** and **rk3568**. + > _name_ indicates the product name, for example, **hispark_taurus_standard** and **rk3568**. 2. Check the build result. After the build is complete, the following information is displayed in the log: diff --git a/en/device-dev/subsystems/subsys-build-standard-large.md b/en/device-dev/subsystems/subsys-build-standard-large.md index 8f6dad88baa4a1046da2fb014c00b84d42bc062f..b0ff697c263556a2b9cebb3482b72c95da2dfa35 100644 --- a/en/device-dev/subsystems/subsys-build-standard-large.md +++ b/en/device-dev/subsystems/subsys-build-standard-large.md @@ -87,7 +87,7 @@ The process to build OpenHarmony is as follows: ./build.sh --product-name {product_name} ``` - **product\_name** indicates the product supported by the current distribution, for example, Hi3516D V300. + **product\_name** indicates the product supported by the current distribution, for example, hispark_taurus_standard. The image generated after build is stored in the **out/{device_name}/packages/phone/images/** directory. diff --git a/zh-cn/contribute/OpenHarmony-hdf-coding-guide.md b/zh-cn/contribute/OpenHarmony-hdf-coding-guide.md index c21029e4cd794d80c10d2477920eb27a442d8ad0..1e41a3fc45774e9c6ee93d68e1d7706de932561b 100755 --- a/zh-cn/contribute/OpenHarmony-hdf-coding-guide.md +++ b/zh-cn/contribute/OpenHarmony-hdf-coding-guide.md @@ -139,10 +139,10 @@ HDF框架加载驱动所需要的信息来源于HDF框架定义的驱动设备 ```bash $openharmony_src_root/vendor/hisilicon/hispark_taurus/hdf_config # 内核态配置文件目录，无用户态 -$openharmony_src_root/vendor/hisilicon/Hi3516DV300/hdf_config/khdf # 内核态配置文件目录 -$openharmony_src_root/vendor/hisilicon/Hi3516DV300/hdf_config/uhdf # 用户态配置文件目录 -$openharmony_src_root/vendor/hisilicon/Hi3516DV300/hdf_config/khdf/device_info/device_info.hcs # 内核态驱动设备描述配置文件 -$openharmony_src_root/vendor/hisilicon/Hi3516DV300/hdf_config/khdf/lcd/lcd_config.hcs # 内核态驱动私有配置文件 +$openharmony_src_root/vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf # 内核态配置文件目录 +$openharmony_src_root/vendor/hisilicon/hispark_taurus_standard/hdf_config/uhdf # 用户态配置文件目录 +$openharmony_src_root/vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf/device_info/device_info.hcs # 内核态驱动设备描述配置文件 +$openharmony_src_root/vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf/lcd/lcd_config.hcs # 内核态驱动私有配置文件 ``` #### 【规则】驱动设备在配置时，应当充分使用已有的配置信息，继承已有的配置模板 @@ -373,9 +373,9 @@ root { 【样例】 ```bash -$openharmony_src_root/vendor/hisilicon/Hi3516DV300/hdf_config/khdf/sample/sample_config.hcs # 正确，将私有配置文件放置在了sample目录下 +$openharmony_src_root/vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf/sample/sample_config.hcs # 正确，将私有配置文件放置在了sample目录下 -$openharmony_src_root/vendor/hisilicon/Hi3516DV300/hdf_config/khdf/sample_config.hcs # 错误，将私有配置文件放置在了配置根目录下 +$openharmony_src_root/vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf/sample_config.hcs # 错误，将私有配置文件放置在了配置根目录下 ``` #### 【规则】应当将驱动私有配置文件包含到hdf_config配置目录下的hdf.hcs文件中 diff --git a/zh-cn/device-dev/driver/driver-peripherals-audio-des.md b/zh-cn/device-dev/driver/driver-peripherals-audio-des.md index 094404d5afab19413eb36d06bd7fe6853cef4b17..8d2b352893f75acd32776c9457f9f51b205bf5a3 100644 --- a/zh-cn/device-dev/driver/driver-peripherals-audio-des.md +++ b/zh-cn/device-dev/driver/driver-peripherals-audio-des.md @@ -335,7 +335,7 @@ hcs中配置驱动节点、加载顺序、服务名称等。hcs语法可参考HD 标准系统配置文件路径： -vendor/hisilicon/Hi3516DV300/hdf_config/khdf/ +vendor/hisilicon/hispark_taurus_standard/hdf_config/khdf/ 小型系统配置文件路径： @@ -1215,7 +1215,7 @@ hcs文件与目录 ``` 标准系统： -vendor/hisilicon/Hi3516DV300/ +vendor/hisilicon/hispark_taurus_standard/ └── hdf_config └── khdf ├── audio @@ -1365,4 +1365,4 @@ static void *hal_main() ## 总结 -以上就是基于Audio驱动框架进行移植开发过程中，所涉及的所有关键适配点。重点介绍了 Audio驱动适配方法、HDI层接口使用方法。开发者可以根据不同芯片进行适配，方便简单。希望通过本次的文档，您能初步掌握基于HDF框架的Audio驱动开发。 \ No newline at end of file +以上就是基于Audio驱动框架进行移植开发过程中，所涉及的所有关键适配点。重点介绍了 Audio驱动适配方法、HDI层接口使用方法。开发者可以根据不同芯片进行适配，方便简单。希望通过本次的文档，您能初步掌握基于HDF框架的Audio驱动开发。 diff --git a/zh-cn/device-dev/get-code/gettools-acquire.md b/zh-cn/device-dev/get-code/gettools-acquire.md index 3b5c82b55082f62c9b29cc78207c2fbc40326a5a..bd3d14f5a744a751c71a988d3b52f3c4bbc0892e 100644 --- a/zh-cn/device-dev/get-code/gettools-acquire.md +++ b/zh-cn/device-dev/get-code/gettools-acquire.md @@ -110,7 +110,7 @@ hb set ./build.sh --product-name {product_name} --ccache ``` -{product_name}为当前版本支持的平台。比如：Hi3516DV300和rk3568等。 +{product_name}为当前版本支持的平台。比如：hispark_taurus_standard和rk3568等。 编译所生成的文件都归档在out/{device_name}/目录下，结果镜像输出在 out/{device_name}/packages/phone/images/ 目录下。 diff --git a/zh-cn/device-dev/porting/porting-linux-kernel.md b/zh-cn/device-dev/porting/porting-linux-kernel.md index 2dee67659185b5cef8ae4b0559c362f4dd21d46a..f6a70a86789003859076cf0bc2c7e89d87244b65 100644 --- a/zh-cn/device-dev/porting/porting-linux-kernel.md +++ b/zh-cn/device-dev/porting/porting-linux-kernel.md @@ -96,7 +96,7 @@ OH内核态层 = OH Linux内核 + OH内核态特性（可选特性或者必选 # 配置编译环境,使用工程项目自带的clang export PATH=$PROJ_ROOT/prebuilts/clang/ohos/linux-x86_64/llvm/bin:$PROJ_ROOT/prebuilts/gcc/linux-x86/arm/gcc-linaro-7.5.0-arm-linux-gnueabi/bin/:$PATH export MAKE_OPTIONS="ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- CC=clang HOSTCC=clang" - export PRODUCT_PATH=vendor/hisilicon/Hi3516DV300 + export PRODUCT_PATH=vendor/hisilicon/hispark_taurus_standard ``` 3. 注释掉clang不识别的flag。 diff --git a/zh-cn/device-dev/quick-start/quickstart-lite-reference.md b/zh-cn/device-dev/quick-start/quickstart-lite-reference.md index d8a7f6dfaed2d4b7755224d10d1d971740a40d5b..2823f956a30c7c1dfcf3efc4c10395912b0986e4 100644 --- a/zh-cn/device-dev/quick-start/quickstart-lite-reference.md +++ b/zh-cn/device-dev/quick-start/quickstart-lite-reference.md @@ -11,7 +11,7 @@ ``` > ![icon-note.gif](public_sys-resources/icon-note.gif) **说明：** - > _name_为产品名称，例如Hi3516DV300、rk3568等。 + > _name_为产品名称，例如hispark_taurus_standard、rk3568等。 2. 检查编译结果。编译完成后，log中显示如下： diff --git a/zh-cn/device-dev/quick-start/quickstart-standard-reference.md b/zh-cn/device-dev/quick-start/quickstart-standard-reference.md index d8a7f6dfaed2d4b7755224d10d1d971740a40d5b..2823f956a30c7c1dfcf3efc4c10395912b0986e4 100644 --- a/zh-cn/device-dev/quick-start/quickstart-standard-reference.md +++ b/zh-cn/device-dev/quick-start/quickstart-standard-reference.md @@ -11,7 +11,7 @@ ``` > ![icon-note.gif](public_sys-resources/icon-note.gif) **说明：** - > _name_为产品名称，例如Hi3516DV300、rk3568等。 + > _name_为产品名称，例如hispark_taurus_standard、rk3568等。 2. 检查编译结果。编译完成后，log中显示如下： diff --git a/zh-cn/device-dev/subsystems/subsys-build-standard-large.md b/zh-cn/device-dev/subsystems/subsys-build-standard-large.md index ed6ba67128b5c128c06ac75f76aa3b68ba05c5e7..b336a0b69d3cc04974b68d173f7d2f5a56847a46 100644 --- a/zh-cn/device-dev/subsystems/subsys-build-standard-large.md +++ b/zh-cn/device-dev/subsystems/subsys-build-standard-large.md @@ -5,7 +5,7 @@ 编译构建子系统提供了一个基于gn和ninja的编译构建框架。主要提供以下功能： -- 构建不同芯片平台的产品。如：Hi3516DV300平台。 +- 构建不同芯片平台的产品。如：hispark_taurus_standard平台。 - 根据产品配置，按照组件组装并打包产品特性的能力。 @@ -89,14 +89,14 @@ OpenHarmony侧的编译构建流程主要包括编译命令行解析，调用gn ./build.sh --product-name {product_name} ``` - {product_name}为当前版本支持的平台。比如：Hi3516DV300等。 + {product_name}为当前版本支持的平台。比如：hispark_taurus_standard等。 编译完成后，结果镜像保存在 out/{device_name}/packages/phone/images/ 目录下。 - 编译命令支持选项： ``` - --product-name # 必须 编译的产品名称，如：Hi3516DV300 + --product-name # 必须 编译的产品名称，如：hispark_taurus_standard --build-target # 可选 指定编译目标，可以指定多个 --gn-args # 可选 gn参数，支持指定多个 --ccache # 可选 编译使用ccache，需要本地安装ccache @@ -400,7 +400,7 @@ ohos_shared_library("module2") { 该文件定义了有哪些子系统以及这些子系统所在文件夹路径，添加子系统时需要说明子系统path与name，分别表示子系统路径和子系统名。 -4. 在//vendor/{product_company}/{product-name}目录下的产品配置如product-name是Hi3516DV300时，在config.json中添加对应的部件，直接添加到原有部件后即可。 +4. 在//vendor/{product_company}/{product-name}目录下的产品配置如product-name是hispark_taurus_standard时，在config.json中添加对应的部件，直接添加到原有部件后即可。 ``` {