diff --git a/Vitis_Classic/NewInstrCalBoard/src/GPIO_Driv.c b/Vitis_Classic/NewInstrCalBoard/src/GPIO_Driv.c index 85206de..5d5183d 100644 --- a/Vitis_Classic/NewInstrCalBoard/src/GPIO_Driv.c +++ b/Vitis_Classic/NewInstrCalBoard/src/GPIO_Driv.c @@ -15,19 +15,26 @@ u32 CPLD_U1 [11] = {54,55,56,57,58,59,60,61,62,63,64}; u32 CPLD_U2 [11] = {65,66,67,68,69,70,71,72,73,74,75}; u32 CPLD_U3 [11] = {76,77,78,79,80,81,82,83,84,85,86}; -void EMIO_config(void) +int EMIO_config(void) { int xStatus; - GpioConfigPtr = XGpioPs_LookupConfig(XPAR_XGPIOPS_0_BASEADDR); + GpioConfigPtr = XGpioPs_LookupConfig(XPAR_XGPIOPS_0_DEVICE_ID); if(GpioConfigPtr == NULL) { - xil_printf("PS GPIO LookupConfig failed\n\r"); - return; + xil_printf("[E] PS GPIO LookupConfig failed\n\r"); + return XST_FAILURE; + } + else + { + xil_printf("[I] Successfully Find PS GPIO!\r\n"); } xStatus = XGpioPs_CfgInitialize(&psGpioInstancePtr,GpioConfigPtr, GpioConfigPtr->BaseAddr); if(XST_SUCCESS != xStatus) - print(" PS GPIO INIT FAILED \n\r"); + { + xil_printf("[E] PS GPIO INIT FAILED \n\r"); + return XST_FAILURE; + } /*-------------------------------------CPLD_U1------------------------------------*/ //--设置EMIO方向 @@ -109,5 +116,7 @@ void EMIO_config(void) //XGpioPs_SetOutputEnablePin(&psGpioInstancePtr, 83, 1);//83 //XGpioPs_SetOutputEnablePin(&psGpioInstancePtr, 84, 1);//84 //XGpioPs_SetOutputEnablePin(&psGpioInstancePtr, 85, 1);//85 + xil_printf("[I] PS GPIO Init Done!\r\n"); + return XST_SUCCESS; } diff --git a/Vitis_Classic/NewInstrCalBoard/src/GPIO_Driv.h b/Vitis_Classic/NewInstrCalBoard/src/GPIO_Driv.h index c23df3c..45b3265 100644 --- a/Vitis_Classic/NewInstrCalBoard/src/GPIO_Driv.h +++ b/Vitis_Classic/NewInstrCalBoard/src/GPIO_Driv.h @@ -20,6 +20,6 @@ extern u32 CPLD_U1[11]; extern u32 CPLD_U2[11]; extern u32 CPLD_U3[11]; -void EMIO_config(void); +int EMIO_config(void); #endif /* SRC_GPIO_DRIV_H_ */