aboutsummaryrefslogtreecommitdiffstats
path: root/samsung-ipc/device/crespo/crespo_ipc.c
diff options
context:
space:
mode:
Diffstat (limited to 'samsung-ipc/device/crespo/crespo_ipc.c')
-rw-r--r--samsung-ipc/device/crespo/crespo_ipc.c552
1 files changed, 181 insertions, 371 deletions
diff --git a/samsung-ipc/device/crespo/crespo_ipc.c b/samsung-ipc/device/crespo/crespo_ipc.c
index eae60d7..790b09c 100644
--- a/samsung-ipc/device/crespo/crespo_ipc.c
+++ b/samsung-ipc/device/crespo/crespo_ipc.c
@@ -1,9 +1,9 @@
-/**
+/*
* This file is part of libsamsung-ipc.
*
- * Copyright (C) 2011 Paul Kocialkowski <contact@paulk.fr>
- * Joerie de Gram <j.de.gram@gmail.com>
- * Simon Busch <morphis@gravedo.de>
+ * Copyright (C) 2011-2013 Paul Kocialkowski <contact@paulk.fr>
+ * Copyright (C) 2011 Simon Busch <morphis@gravedo.de>
+ * Copyright (C) 2011 Joerie de Gram <j.de.gram@gmail.com>
*
* libsamsung-ipc is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,432 +17,247 @@
*
* You should have received a copy of the GNU General Public License
* along with libsamsung-ipc. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#include <stdlib.h>
+#include <stdio.h>
#include <stdint.h>
-#include <unistd.h>
#include <stdbool.h>
-#include <termios.h>
-#include <fcntl.h>
#include <string.h>
+#include <fcntl.h>
#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <asm/types.h>
-#include <mtd/mtd-abi.h>
-#include <assert.h>
#include <samsung-ipc.h>
+#include <ipc.h>
+#include <util.h>
#include "crespo_modem_ctl.h"
+
+#include "xmm6160.h"
#include "crespo_ipc.h"
-#include "ipc.h"
int crespo_ipc_bootstrap(struct ipc_client *client)
{
- int s3c2410_serial3_fd = -1;
- int modem_ctl_fd = -1;
+ void *modem_image_data = NULL;
- /* Control variables. */
- int rc = 0;
-
- /* Boot variables */
- uint8_t *radio_img_p = NULL;
- uint8_t bootcore_version = 0;
- uint8_t info_size = 0;
- uint8_t crc_byte = 0;
- int block_size = 0;
-
- /* s3c2410 serial setup variables. */
- struct termios termios;
- int serial;
-
- /* fds maniplation variables */
- struct timeval timeout;
- fd_set fds;
+ int modem_ctl_fd = -1;
+ int serial_fd = -1;
- /* nv_data variables */
- void *nv_data_p;
+ int rc;
- /* General purpose variables. */
- uint8_t data;
- uint16_t data_16;
- uint8_t *data_p;
- int i;
+ if (client == NULL)
+ return -1;
- ipc_client_log(client, "crespo_ipc_bootstrap: enter");
+ ipc_client_log(client, "Starting crespo modem bootstrap");
- /* Read the radio.img image. */
- ipc_client_log(client, "crespo_ipc_bootstrap: reading radio image");
- radio_img_p = ipc_client_mtd_read(client, "/dev/mtd/mtd5ro", RADIO_IMG_SIZE, 0x1000);
- if (radio_img_p == NULL) {
- radio_img_p = ipc_client_mtd_read(client, "/dev/mtd5ro", RADIO_IMG_SIZE, 0x1000);
- if (radio_img_p == NULL)
- goto error;
+ modem_image_data = file_data_read(MODEM_IMAGE_DEVICE, MODEM_IMAGE_SIZE, 0x1000);
+ if (modem_image_data == NULL) {
+ ipc_client_log(client, "Reading modem image data failed");
+ goto error;
}
- ipc_client_log(client, "crespo_ipc_bootstrap: radio image read");
+ ipc_client_log(client, "Read modem image data");
- ipc_client_log(client, "crespo_ipc_bootstrap: open modem_ctl");
- modem_ctl_fd=open("/dev/modem_ctl", O_RDWR | O_NDELAY);
- if(modem_ctl_fd < 0)
+ modem_ctl_fd = open(MODEM_CTL_DEVICE, O_RDWR | O_NDELAY);
+ if (modem_ctl_fd < 0) {
+ ipc_client_log(client, "Opening modem ctl failed");
goto error;
+ }
+ ipc_client_log(client, "Opened modem ctl");
- /* Reset the modem before init to send the first part of modem.img. */
rc = ioctl(modem_ctl_fd, IOCTL_MODEM_RESET);
- if (rc < 0)
+ if (rc < 0) {
+ ipc_client_log(client, "Resetting modem failed");
goto error;
-
- usleep(400000);
-
- ipc_client_log(client, "crespo_ipc_bootstrap: open s3c2410_serial3");
- s3c2410_serial3_fd=open("/dev/s3c2410_serial3", O_RDWR | O_NDELAY);
- if(s3c2410_serial3_fd < 0)
- goto error;
-
- /* Setup the s3c2410 serial. */
- ipc_client_log(client, "crespo_ipc_bootstrap: setup s3c2410_serial3");
- tcgetattr(s3c2410_serial3_fd, &termios);
-
- cfmakeraw(&termios);
- cfsetispeed(&termios, B115200);
- cfsetospeed(&termios, B115200);
-
- tcsetattr(s3c2410_serial3_fd, TCSANOW, &termios);
-
- /* Send 'AT' in ASCII. */
- ipc_client_log(client, "crespo_ipc_bootstrap: sending AT in ASCII");
- for(i=0 ; i < 20 ; i++)
- {
- rc = write(s3c2410_serial3_fd, "AT", 2);
- usleep(50000);
}
- ipc_client_log(client, "crespo_ipc_bootstrap: sending AT in ASCII done");
-
- usleep(50000); //FIXME
+ ipc_client_log(client, "Reset modem");
- /* Get and check bootcore version. */
- rc = read(s3c2410_serial3_fd, &bootcore_version, sizeof(bootcore_version));
- if (rc < 0)
+ serial_fd = open(MODEM_SERIAL_DEVICE, O_RDWR | O_NDELAY);
+ if (serial_fd < 0) {
+ ipc_client_log(client, "Opening serial failed");
goto error;
-
- ipc_client_log(client, "crespo_ipc_bootstrap: got bootcore version: 0x%x", bootcore_version);
-
- if(bootcore_version != BOOTCORE_VERSION)
- goto error;
-
- /* Get info_size. */
- rc = read(s3c2410_serial3_fd, &info_size, sizeof(info_size));
- if (rc < 0)
- goto error;
-
- ipc_client_log(client, "crespo_ipc_bootstrap: got info_size: 0x%x", info_size);
-
- /* Send PSI magic. */
- data = PSI_MAGIC;
- rc = write(s3c2410_serial3_fd, &data, sizeof(data));
- if (rc < 0)
- goto error;
-
- ipc_client_log(client, "crespo_ipc_bootstrap: sent PSI_MAGIC (0x%x)", PSI_MAGIC);
-
- /* Send PSI data len. */
- data_16 = PSI_DATA_LEN;
- data_p = (uint8_t *)&data_16;
-
- for(i=0 ; i < 2 ; i++)
- {
- rc = write(s3c2410_serial3_fd, data_p, 1);
- if (rc < 0)
- goto error;
-
- data_p++;
}
- ipc_client_log(client, "crespo_ipc_bootstrap: sent PSI_DATA_LEN (0x%x)", PSI_DATA_LEN);
-
- /* Write the first part of modem.img. */
- FD_ZERO(&fds);
- FD_SET(s3c2410_serial3_fd, &fds);
+ ipc_client_log(client, "Opened serial");
- timeout.tv_sec = 4;
- timeout.tv_usec = 0;
+ usleep(100000);
- data_p = radio_img_p;
-
- ipc_client_log(client, "crespo_ipc_bootstrap: sending the first part of radio.img");
-
- for (i=0 ; i < PSI_DATA_LEN ; i++)
- {
- if (select(FD_SETSIZE, NULL, &fds, NULL, &timeout) == 0)
- {
- ipc_client_log(client, "crespo_ipc_bootstrap: select timeout passed");
- goto error;
- }
-
- rc = write(s3c2410_serial3_fd, data_p, 1);
- if (rc < 0)
- goto error;
-
- crc_byte = crc_byte ^ *data_p;
- data_p++;
- }
-
- ipc_client_log(client, "crespo_ipc_bootstrap: first part of radio.img sent; crc_byte is 0x%x", crc_byte);
-
- if (select(FD_SETSIZE, NULL, &fds, NULL, &timeout) == 0)
- {
- ipc_client_log(client, "crespo_ipc_bootstrap: select timeout passed");
+ rc = xmm6160_psi_send(client, serial_fd, modem_image_data, MODEM_IMAGE_SIZE);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM6160 PSI failed");
goto error;
}
+ ipc_client_log(client, "Sent XMM6160 PSI");
- rc = write(s3c2410_serial3_fd, &crc_byte, sizeof(crc_byte));
- if (rc < 0)
+ rc = xmm6160_modem_image_send(client, modem_ctl_fd, NULL, modem_image_data, MODEM_IMAGE_SIZE, 0);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM6160 modem image failed");
goto error;
-
- ipc_client_log(client, "crespo_ipc_bootstrap: crc_byte sent");
-
- data = 0;
- for (i = 0 ; data != 0x01 ; i++)
- {
- if (select(FD_SETSIZE, &fds, NULL, NULL, &timeout) == 0)
- {
- ipc_client_log(client, "crespo_ipc_bootstrap: select timeout passed");
- goto error;
- }
-
- rc = read(s3c2410_serial3_fd, &data, sizeof(data));
- if (rc < 0)
- goto error;
-
- if(i > 50)
- {
- ipc_client_log(client, "crespo_ipc_bootstrap: fairly too much attempts to get ACK");
- goto error;
- }
- }
-
- ipc_client_log(client, "crespo_ipc_bootstrap: close s3c2410_serial3");
- close(s3c2410_serial3_fd);
-
- ipc_client_log(client, "crespo_ipc_bootstrap: writing the rest of radio.img to modem_ctl.");
- /* Seek to the begining of modem_ctl_fd (should already be so). */
- lseek(modem_ctl_fd, 0, SEEK_SET);
-
- /* Pointer to the remaining part of radio.img. */
- data_p = radio_img_p + PSI_DATA_LEN;
-
- FD_ZERO(&fds);
- FD_SET(modem_ctl_fd, &fds);
-
- block_size = 0x100000;
-
- for (i=0 ; i < (RADIO_IMG_SIZE - PSI_DATA_LEN) / block_size ; i++)
- {
- if (select(FD_SETSIZE, NULL, &fds, NULL, &timeout) == 0)
- {
- ipc_client_log(client, "crespo_ipc_bootstrap: select timeout passed");
- goto error;
- }
-
- rc = write(modem_ctl_fd, data_p, block_size);
- if (rc < 0)
- goto error;
-
- data_p += block_size;
}
+ ipc_client_log(client, "Sent XMM6160 modem image");
- free(radio_img_p);
-
- /* nv_data part. */
-
- /* Check if all the nv_data files are ok. */
- if (nv_data_check(client) < 0)
+ rc = xmm6160_nv_data_send(client, modem_ctl_fd, NULL, NV_DATA_OFFSET);
+ if (rc < 0) {
+ ipc_client_log(client, "Sending XMM6160 nv_data failed");
goto error;
-
- /* Check if the MD5 is ok. */
- if (nv_data_md5_check(client) < 0)
- goto error;
-
- /* Write nv_data.bin to modem_ctl. */
- ipc_client_log(client, "crespo_ipc_bootstrap: write nv_data to modem_ctl");
-
- nv_data_p = ipc_client_file_read(client, nv_data_path(client), nv_data_size(client), nv_data_chunk_size(client));
- if (nv_data_p == NULL)
- goto error;
-
- data_p = nv_data_p;
- lseek(modem_ctl_fd, RADIO_IMG_SIZE, SEEK_SET);
-
- for(i=0 ; i < 2 ; i++)
- {
- rc = write(modem_ctl_fd, data_p, nv_data_size(client) / 2);
- if (rc < 0)
- goto error;
-
- data_p += nv_data_size(client) / 2;
}
-
- free(nv_data_p);
- close(modem_ctl_fd);
+ ipc_client_log(client, "Sent XMM6160 nv_data");
rc = 0;
- goto exit;
+ goto complete;
error:
- ipc_client_log(client, "%s: something went wrong", __func__);
rc = -1;
-exit:
- ipc_client_log(client, "crespo_ipc_bootstrap: exit");
+complete:
+ if (modem_image_data != NULL)
+ free(modem_image_data);
+
+ if (serial_fd >= 0)
+ close(serial_fd);
+
+ if (modem_ctl_fd >= 0)
+ close(modem_ctl_fd);
+
return rc;
}
int crespo_ipc_fmt_send(struct ipc_client *client, struct ipc_message_info *request)
{
- struct modem_io modem_data;
- struct ipc_header reqhdr;
- int rc = 0;
+ struct ipc_header header;
+ struct modem_io mio;
+ int rc;
- memset(&modem_data, 0, sizeof(struct modem_io));
- modem_data.size = request->length + sizeof(struct ipc_header);
+ if (client == NULL || client->handlers == NULL || client->handlers->write == NULL || request == NULL)
+ return -1;
- reqhdr.mseq = request->mseq;
- reqhdr.aseq = request->aseq;
- reqhdr.group = request->group;
- reqhdr.index = request->index;
- reqhdr.type = request->type;
- reqhdr.length = (uint16_t) (request->length + sizeof(struct ipc_header));
+ ipc_header_fill(&header, request);
- modem_data.data = malloc(reqhdr.length);
+ memset(&mio, 0, sizeof(struct modem_io));
+ mio.size = request->length + sizeof(struct ipc_header);
+ mio.data = malloc(mio.size);
+ memcpy(mio.data, &header, sizeof(struct ipc_header));
+ if (request->data != NULL && request->length > 0)
+ memcpy((void *) ((unsigned char *) mio.data + sizeof(struct ipc_header)), request->data, request->length);
- memcpy(modem_data.data, &reqhdr, sizeof(struct ipc_header));
- memcpy((unsigned char *) (modem_data.data + sizeof(struct ipc_header)), request->data, request->length);
+ ipc_client_log_send(client, request, __func__);
- assert(client->handlers->write != NULL);
+ rc = client->handlers->write(client->handlers->transport_data, (void *) &mio, sizeof(struct modem_io));
- ipc_client_log_send(client, request, __func__);
+ free(mio.data);
- rc = client->handlers->write(client->handlers->transport_data, (uint8_t*) &modem_data, sizeof(struct modem_io));
return rc;
}
int crespo_ipc_fmt_recv(struct ipc_client *client, struct ipc_message_info *response)
{
- struct modem_io modem_data;
- struct ipc_header *resphdr;
- int bread = 0;
-
- memset(&modem_data, 0, sizeof(struct modem_io));
- modem_data.data = malloc(MAX_MODEM_DATA_SIZE);
- modem_data.size = MAX_MODEM_DATA_SIZE;
-
- memset(response, 0, sizeof(struct ipc_message_info));
+ struct ipc_header *header;
+ struct modem_io mio;
+ int rc;
- assert(client->handlers->read != NULL);
- bread = client->handlers->read(client->handlers->transport_data, (uint8_t*) &modem_data, sizeof(struct modem_io) + MAX_MODEM_DATA_SIZE);
- if (bread < 0)
- {
- ipc_client_log(client, "crespo_ipc_fmt_client_recv: can't receive enough bytes from modem to process incoming response!");
+ if (client == NULL || client->handlers == NULL || client->handlers->read == NULL || response == NULL)
return -1;
- }
- if(modem_data.size <= 0 || modem_data.size >= MAX_MODEM_DATA_SIZE || modem_data.data == NULL)
- {
- ipc_client_log(client, "crespo_ipc_fmt_client_recv: we retrieve less (or fairly too much) bytes from the modem than we exepected!");
- return -1;
- }
+ memset(&mio, 0, sizeof(struct modem_io));
+ mio.size = MODEM_DATA_SIZE;
+ mio.data = malloc(mio.size);
- resphdr = (struct ipc_header *) modem_data.data;
+ rc = client->handlers->read(client->handlers->transport_data, &mio, sizeof(struct modem_io) + mio.size);
+ if (rc < 0 || mio.data == NULL || mio.size < sizeof(struct ipc_header)) {
+ ipc_client_log(client, "Reading FMT data from the modem failed");
+ goto error;
+ }
- response->mseq = resphdr->mseq;
- response->aseq = resphdr->aseq;
- response->group = resphdr->group;
- response->index = resphdr->index;
- response->type = resphdr->type;
- response->cmd = IPC_COMMAND(response);
- response->length = modem_data.size - sizeof(struct ipc_header);
- response->data = NULL;
+ header = (struct ipc_header *) mio.data;
+ ipc_message_info_fill(header, response);
- if(response->length > 0)
- {
+ if (mio.size > sizeof(struct ipc_header)) {
+ response->length = mio.size - sizeof(struct ipc_header);
response->data = malloc(response->length);
- memcpy(response->data, (uint8_t *) modem_data.data + sizeof(struct ipc_header), response->length);
+ memcpy(response->data, (void *) ((unsigned char *) mio.data + sizeof(struct ipc_header)), response->length);
}
- free(modem_data.data);
-
ipc_client_log_recv(client, response, __func__);
- return 0;
+ goto complete;
+
+error:
+ rc = -1;
+
+complete:
+ if (mio.data != NULL)
+ free(mio.data);
+
+ return rc;
}
int crespo_ipc_rfs_send(struct ipc_client *client, struct ipc_message_info *request)
{
- struct modem_io modem_data;
- int rc = 0;
-
- memset(&modem_data, 0, sizeof(struct modem_io));
+ struct modem_io mio;
+ int rc;
- modem_data.id = request->mseq;
- modem_data.cmd = request->index;
+ if (client == NULL || client->handlers == NULL || client->handlers->write == NULL || request == NULL)
+ return -1;
- modem_data.size = request->length;
- modem_data.data = malloc(request->length);
+ memset(&mio, 0, sizeof(struct modem_io));
+ mio.id = request->mseq;
+ mio.cmd = request->index;
+ mio.size = request->length;
+ if (request->data != NULL && request->length > 0) {
+ mio.data = malloc(mio.size);
+ memcpy(mio.data, request->data, request->length);
+ }
- memcpy(modem_data.data, request->data, request->length);
+ ipc_client_log_send(client, request, __func__);
- assert(client->handlers->write != NULL);
+ rc = client->handlers->write(client->handlers->transport_data, (void *) &mio, sizeof(struct modem_io));
- ipc_client_log_send(client, request, __func__);
+ if (mio.data != NULL)
+ free(mio.data);
- rc = client->handlers->write(client->handlers->transport_data, (uint8_t*) &modem_data, sizeof(struct modem_io));
return rc;
}
int crespo_ipc_rfs_recv(struct ipc_client *client, struct ipc_message_info *response)
{
- struct modem_io modem_data;
- int bread = 0;
-
- memset(&modem_data, 0, sizeof(struct modem_io));
- modem_data.data = malloc(MAX_MODEM_DATA_SIZE);
- modem_data.size = MAX_MODEM_DATA_SIZE;
-
- memset(response, 0, sizeof(struct ipc_message_info));
+ struct modem_io mio;
+ int rc;
- assert(client->handlers->read != NULL);
- bread = client->handlers->read(client->handlers->transport_data, (uint8_t*) &modem_data, sizeof(struct modem_io) + MAX_MODEM_DATA_SIZE);
- if (bread < 0)
- {
- ipc_client_log(client, "crespo_ipc_rfs_client_recv: can't receive enough bytes from modem to process incoming response!");
+ if (client == NULL || client->handlers == NULL || client->handlers->read == NULL || response == NULL)
return -1;
- }
- if(modem_data.size <= 0 || modem_data.size >= MAX_MODEM_DATA_SIZE || modem_data.data == NULL)
- {
- ipc_client_log(client, "crespo_ipc_rfs_client_recv: we retrieve less (or fairly too much) bytes from the modem than we exepected!");
- return -1;
+ memset(&mio, 0, sizeof(struct modem_io));
+ mio.size = MODEM_DATA_SIZE;
+ mio.data = malloc(mio.size);
+
+ rc = client->handlers->read(client->handlers->transport_data, &mio, sizeof(struct modem_io) + mio.size);
+ if (rc < 0 || mio.data == NULL || mio.size <= 0) {
+ ipc_client_log(client, "Reading RFS data from the modem failed");
+ goto error;
}
- response->mseq = 0;
- response->aseq = modem_data.id;
+ memset(response, 0, sizeof(struct ipc_message_info));
+ response->aseq = mio.id;
response->group = IPC_GROUP_RFS;
- response->index = modem_data.cmd;
- response->type = 0;
- response->length = modem_data.size;
- response->data = NULL;
+ response->index = mio.cmd;
- if(response->length > 0)
- {
+ if (mio.size > 0) {
+ response->length = mio.size;
response->data = malloc(response->length);
- memcpy(response->data, (uint8_t *) modem_data.data, response->length);
+ memcpy(response->data, mio.data, response->length);
}
- free(modem_data.data);
-
ipc_client_log_recv(client, response, __func__);
- return 0;
+ goto complete;
+
+error:
+ rc = -1;
+
+complete:
+ if (mio.data != NULL)
+ free(mio.data);
+
+ return rc;
}
int crespo_ipc_open(void *transport_data, int type)
@@ -458,10 +273,10 @@ int crespo_ipc_open(void *transport_data, int type)
switch(type)
{
case IPC_CLIENT_TYPE_FMT:
- fd = open("/dev/modem_fmt", O_RDWR | O_NOCTTY | O_NONBLOCK);
+ fd = open(MODEM_FMT_DEVICE, O_RDWR | O_NOCTTY | O_NONBLOCK);
break;
case IPC_CLIENT_TYPE_RFS:
- fd = open("/dev/modem_rfs", O_RDWR | O_NOCTTY | O_NONBLOCK);
+ fd = open(MODEM_RFS_DEVICE, O_RDWR | O_NOCTTY | O_NONBLOCK);
break;
default:
return -1;
@@ -489,6 +304,7 @@ int crespo_ipc_close(void *transport_data)
if (fd < 0)
return -1;
+ data->fd = -1;
close(fd);
return 0;
@@ -500,7 +316,7 @@ int crespo_ipc_read(void *transport_data, void *buffer, unsigned int length)
int fd;
int rc;
- if (transport_data == NULL)
+ if (transport_data == NULL || buffer == NULL || length == 0)
return -1;
data = (struct crespo_ipc_transport_data *) transport_data;
@@ -522,7 +338,7 @@ int crespo_ipc_write(void *transport_data, void *buffer, unsigned int length)
int fd;
int rc;
- if (transport_data == NULL)
+ if (transport_data == NULL || buffer == NULL || length == 0)
return -1;
data = (struct crespo_ipc_transport_data *) transport_data;
@@ -532,7 +348,7 @@ int crespo_ipc_write(void *transport_data, void *buffer, unsigned int length)
return -1;
rc = ioctl(fd, IOCTL_MODEM_SEND, buffer);
- if(rc < 0)
+ if (rc < 0)
return -1;
return 0;
@@ -563,21 +379,18 @@ int crespo_ipc_poll(void *transport_data, struct timeval *timeout)
int crespo_ipc_power_on(void *power_data)
{
- int fd=open("/dev/modem_ctl", O_RDWR);
+ int fd;
int rc;
-/*
- fd = open("/sys/devices/platform/modemctl/power_mode", O_RDWR);
- rc = write(fd, "1", 1);
-*/
-
- if(fd < 0)
+ fd = open(MODEM_CTL_DEVICE, O_RDWR);
+ if (fd < 0)
return -1;
rc = ioctl(fd, IOCTL_MODEM_START);
+
close(fd);
- if(rc < 0)
+ if (rc < 0)
return -1;
return 0;
@@ -585,21 +398,18 @@ int crespo_ipc_power_on(void *power_data)
int crespo_ipc_power_off(void *power_data)
{
- int fd=open("/dev/modem_ctl", O_RDWR);
+ int fd;
int rc;
-/*
- fd = open("/sys/devices/platform/modemctl/power_mode", O_RDWR);
- rc = write(fd, "0", 1);
-*/
-
- if(fd < 0)
+ fd = open(MODEM_CTL_DEVICE, O_RDWR);
+ if (fd < 0)
return -1;
rc = ioctl(fd, IOCTL_MODEM_OFF);
+
close(fd);
- if(rc < 0)
+ if (rc < 0)
return -1;
return 0;
@@ -626,7 +436,7 @@ int crespo_ipc_data_destroy(void *transport_data, void *power_data, void *gprs_d
return 0;
}
-char *crespo_2_6_35_ipc_gprs_get_iface(int cid)
+char *crespo_ipc_gprs_get_iface_single(int cid)
{
char *iface = NULL;
@@ -635,19 +445,7 @@ char *crespo_2_6_35_ipc_gprs_get_iface(int cid)
return iface;
}
-char *crespo_3_0_ipc_gprs_get_iface(int cid)
-{
- char *iface = NULL;
-
- if(cid > GPRS_IFACE_COUNT)
- return NULL;
-
- asprintf(&iface, "%s%d", GPRS_IFACE_PREFIX, cid - 1);
-
- return iface;
-}
-
-int crespo_2_6_35_ipc_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities)
+int crespo_ipc_gprs_get_capabilities_single(struct ipc_client_gprs_capabilities *capabilities)
{
if (capabilities == NULL)
return -1;
@@ -658,7 +456,19 @@ int crespo_2_6_35_ipc_gprs_get_capabilities(struct ipc_client_gprs_capabilities
return 0;
}
-int crespo_3_0_ipc_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities)
+char *crespo_ipc_gprs_get_iface(int cid)
+{
+ char *iface = NULL;
+
+ if (cid > GPRS_IFACE_COUNT)
+ return NULL;
+
+ asprintf(&iface, "%s%d", GPRS_IFACE_PREFIX, cid - 1);
+
+ return iface;
+}
+
+int crespo_ipc_gprs_get_capabilities(struct ipc_client_gprs_capabilities *capabilities)
{
if (capabilities == NULL)
return -1;
@@ -698,14 +508,14 @@ struct ipc_handlers crespo_ipc_handlers = {
.data_destroy = crespo_ipc_data_destroy,
};
-struct ipc_gprs_specs crespo_2_6_35_ipc_gprs_specs = {
- .gprs_get_iface = crespo_2_6_35_ipc_gprs_get_iface,
- .gprs_get_capabilities = crespo_2_6_35_ipc_gprs_get_capabilities,
+struct ipc_gprs_specs crespo_ipc_gprs_specs_single = {
+ .gprs_get_iface = crespo_ipc_gprs_get_iface_single,
+ .gprs_get_capabilities = crespo_ipc_gprs_get_capabilities_single,
};
-struct ipc_gprs_specs crespo_3_0_ipc_gprs_specs = {
- .gprs_get_iface = crespo_3_0_ipc_gprs_get_iface,
- .gprs_get_capabilities = crespo_3_0_ipc_gprs_get_capabilities,
+struct ipc_gprs_specs crespo_ipc_gprs_specs = {
+ .gprs_get_iface = crespo_ipc_gprs_get_iface,
+ .gprs_get_capabilities = crespo_ipc_gprs_get_capabilities,
};
// vim:ts=4:sw=4:expandtab
generated by cgit v1.1 at 2024-05-23 16:45:32 +0000