shinys000114/wiringPi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ODROID-M1: fix pin of softTone and correct typos

Browse Source 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: I2e5e4a0c992aa53df5b1ee54e3a13095f9fa8364
This commit is contained in:
Steve Jeong
2023-08-17 08:21:28 +00:00
parent 08ecb29832
commit fbbfe6e7e6
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wiringPi/odroidm1.c
View File

@@ -527,9 +527,9 @@ __attribute__ ((unused))static int _pinMode (int pin, int mode)
bitNum = pin - (bank * GPIO_SIZE); bitNum = pin - (bank * GPIO_SIZE);
offset = bitNum / 16 == 0 ? M1_GPIO_DIR_OFFSET : M1_GPIO_DIR_OFFSET + 0x4; offset = bitNum / 16 == 0 ? M1_GPIO_DIR_OFFSET : M1_GPIO_DIR_OFFSET + 0x4;
pwmRelease (origPin); pwmRelease(origPin);
softPwmStop(pin); softPwmStop(origPin);
softToneStop(pin); softToneStop(origPin);
target = *(gpio[bank] + (offset >> 2)); target = *(gpio[bank] + (offset >> 2));
target |= (1 << (gpioToShiftRegBy16(pin) + 16)); target |= (1 << (gpioToShiftRegBy16(pin) + 16));
@@ -580,9 +580,9 @@ __attribute__ ((unused))static int _pinMode (int pin, int mode)
__attribute__ ((unused))static int _pinMode_gpiod (int pin, int mode) __attribute__ ((unused))static int _pinMode_gpiod (int pin, int mode)
{ {
uint8_t bank, bitNum; uint8_t bank, bitNum;
int oriPin, ret; int origPin, ret;
oriPin = pin; origPin = pin;
if (lib->mode == MODE_GPIO_SYS) if (lib->mode == MODE_GPIO_SYS)
return -1; return -1;
@@ -593,8 +593,9 @@ __attribute__ ((unused))static int _pinMode_gpiod (int pin, int mode)
bank = pin / GPIO_SIZE; bank = pin / GPIO_SIZE;
bitNum = pin - (bank * GPIO_SIZE); bitNum = pin - (bank * GPIO_SIZE);
softPwmStop(pin); pwmRelease(origPin);
softToneStop(pin); softPwmStop(origPin);
softToneStop(origPin);
chip = gpiod_chip_open_by_number(bank); chip = gpiod_chip_open_by_number(bank);
if (!chip) { if (!chip) {
@@ -615,7 +616,7 @@ __attribute__ ((unused))static int _pinMode_gpiod (int pin, int mode)
printf("gpiod request error\n"); printf("gpiod request error\n");
gpiod_line_release(gpiod); gpiod_line_release(gpiod);
} }
_pullUpDnControl(oriPin, PUD_OFF); _pullUpDnControl(origPin, PUD_OFF);
break; break;
case OUTPUT: case OUTPUT:
ret = gpiod_line_request_output(gpiod, CONSUMER, 0); ret = gpiod_line_request_output(gpiod, CONSUMER, 0);
@@ -630,7 +631,7 @@ __attribute__ ((unused))static int _pinMode_gpiod (int pin, int mode)
printf("gpiod request error\n"); printf("gpiod request error\n");
gpiod_line_release(gpiod); gpiod_line_release(gpiod);
} }
_pullUpDnControl(oriPin, PUD_UP); _pullUpDnControl(origPin, PUD_UP);
break; break;
case INPUT_PULLDOWN: case INPUT_PULLDOWN:
ret = gpiod_line_request_input(gpiod, CONSUMER); ret = gpiod_line_request_input(gpiod, CONSUMER);
@@ -638,13 +639,13 @@ __attribute__ ((unused))static int _pinMode_gpiod (int pin, int mode)
printf("gpiod request error\n"); printf("gpiod request error\n");
gpiod_line_release(gpiod); gpiod_line_release(gpiod);
} }
_pullUpDnControl(oriPin, PUD_DOWN); _pullUpDnControl(origPin, PUD_DOWN);
break; break;
case SOFT_PWM_OUTPUT: case SOFT_PWM_OUTPUT:
softPwmCreate(oriPin, 0, 100); softPwmCreate(origPin, 0, 100);
break; break;
case SOFT_TONE_OUTPUT: case SOFT_TONE_OUTPUT:
softToneCreate(oriPin); softToneCreate(origPin);
break; break;
default: default:
msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode); msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);