Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 01:05:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

lcd_dev: put header in correct location; fix missing const

Browse Source
This commit is contained in:
Matias N
2020-10-31 15:10:52 -03:00
committed by Xiang Xiao
parent a01a01ab45
commit f97f1bbd1a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/lcd/lcd_dev.c
+3 -3
View File
@@ -39,7 +39,7 @@
#include <nuttx/irq.h>
#include <nuttx/board.h>
#include "lcd_dev.h"
#include <nuttx/lcd/lcd_dev.h>
/****************************************************************************
* Private Types
@@ -124,7 +124,7 @@ static int lcddev_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case LCDDEVIO_GETRUN:
{
FAR struct lcddev_run_s *lcd_putrun =
(const FAR struct lcddev_run_s *)arg;
(FAR struct lcddev_run_s *)arg;
ret = priv->planeinfo.getrun(lcd_putrun->row, lcd_putrun->col,
lcd_putrun->data, lcd_putrun->npixels);
@@ -133,7 +133,7 @@ static int lcddev_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case LCDDEVIO_PUTRUN:
{
const FAR struct lcddev_run_s *lcd_putrun =
(FAR struct lcddev_run_s *)arg;
(const FAR struct lcddev_run_s *)arg;
ret = priv->planeinfo.putrun(lcd_putrun->row, lcd_putrun->col,
lcd_putrun->data, lcd_putrun->npixels);
drivers/lcd/lcd_dev.h
-105
View File
@@ -1,105 +0,0 @@
/****************************************************************************
* drivers/lcd/lcd_dev.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
#ifndef __DRIVERS_LCD_LCD_DEV_H
#define __DRIVERS_LCD_LCD_DEV_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/input/ioctl.h>
#include <nuttx/lcd/lcd.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Type Definitions
****************************************************************************/
#define LCDDEVIO_PUTRUN _LCDIOC(0) /* Arg: const struct lcddev_putrun_s* */
#define LCDDEVIO_GETRUN _LCDIOC(1) /* Arg: struct lcddev_putrun_s* */
#define LCDDEVIO_GETPOWER _LCDIOC(2) /* Arg: int* */
#define LCDDEVIO_SETPOWER _LCDIOC(3) /* Arg: int */
#define LCDDEVIO_GETCONTRAST _LCDIOC(4) /* Arg: int* */
#define LCDDEVIO_SETCONTRAST _LCDIOC(5) /* Arg: unsigned int */
#define LCDDEVIO_GETPLANEINFO _LCDIOC(6) /* Arg: struct lcd_planeinfo_s* */
#define LCDDEVIO_GETVIDEOINFO _LCDIOC(7) /* Arg: struct fb_videoinfo_s* */
#define LCDDEVIO_SETPLANENO _LCDIOC(8) /* Arg: int */
#ifdef CONFIG_FB_CMAP
#define LCDDEVIO_GETCMAP _LCDIOC(9) /* Arg: struct fb_cmap_s* */
#define LCDDEVIO_PUTCMAP _LCDIOC(10) /* Arg: const struct fb_cmap_s* */
#endif
#ifdef CONFIG_FB_HWCURSOR
#define LCDDEVIO_GETCURSOR _LCDIOC(11) /* Arg: struct fb_cursorattrib_s* */
#define LCDDEVIO_SETCURSOR _LCDIOC(12) /* Arg: struct fb_setcursor_s* */
#endif
/****************************************************************************
* Public Data
****************************************************************************/
#ifdef __cplusplus
#define EXTERN extern "C"
extern "C"
{
#else
#define EXTERN extern
#endif
struct lcddev_run_s
{
fb_coord_t row, col;
FAR uint8_t *data;
size_t npixels;
};
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
/****************************************************************************
* Name: lcddev_register
*
* Description:
* Register the lcd_dev character driver as the specified device.
*
* Input Parameters:
* devno - The LCD device number.
*
* Returned Value:
* Zero (OK) is returned on success. Otherwise a negated errno value is
* returned to indicate the nature of the failure.
*
****************************************************************************/
int lcddev_register(int devno);
#undef EXTERN
#ifdef __cplusplus
}
#endif
#endif /* __DRIVERS_LCD_LCD_DEV_H */