serial: add ADDI-DATA GmbH PCI-Express communication cards in 8250_pci.c and pci_ids.h

[safe/jmp/linux-2.6] / include / media / soc_camera.h

diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index f623c01..3d74e60 100644 (file)
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -22,13 +22,11 @@ struct soc_camera_device {
        struct list_head list;
        struct device dev;
        struct device *pdev;            /* Platform device */
-       struct v4l2_rect rect_current;  /* Current window */
-       struct v4l2_rect rect_max;      /* Maximum window */
+       s32 user_width;
+       s32 user_height;
        unsigned short width_min;
        unsigned short height_min;
        unsigned short y_skip_top;      /* Lines to skip at the top */
-       unsigned short gain;
-       unsigned short exposure;
        unsigned char iface;            /* Host number */
        unsigned char devnum;           /* Device number per host */
        unsigned char buswidth;         /* See comment in .c */
@@ -67,9 +65,18 @@ struct soc_camera_host_ops {
        void (*remove)(struct soc_camera_device *);
        int (*suspend)(struct soc_camera_device *, pm_message_t);
        int (*resume)(struct soc_camera_device *);
+       /*
+        * .get_formats() is called for each client device format, but
+        * .put_formats() is only called once. Further, if any of the calls to
+        * .get_formats() fail, .put_formats() will not be called at all, the
+        * failing .get_formats() must then clean up internally.
+        */
        int (*get_formats)(struct soc_camera_device *, int,
                           struct soc_camera_format_xlate *);
-       int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *);
+       void (*put_formats)(struct soc_camera_device *);
+       int (*cropcap)(struct soc_camera_device *, struct v4l2_cropcap *);
+       int (*get_crop)(struct soc_camera_device *, struct v4l2_crop *);
+       int (*set_crop)(struct soc_camera_device *, struct v4l2_crop *);
        int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *);
        int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
        void (*init_videobuf)(struct videobuf_queue *,
@@ -119,28 +126,39 @@ struct soc_camera_link {
        void (*free_bus)(struct soc_camera_link *);
 };
 
-static inline struct soc_camera_device *to_soc_camera_dev(struct device *dev)
+static inline struct soc_camera_device *to_soc_camera_dev(
+       const struct device *dev)
 {
        return container_of(dev, struct soc_camera_device, dev);
 }
 
-static inline struct soc_camera_host *to_soc_camera_host(struct device *dev)
+static inline struct soc_camera_host *to_soc_camera_host(
+       const struct device *dev)
 {
        struct v4l2_device *v4l2_dev = dev_get_drvdata(dev);
 
        return container_of(v4l2_dev, struct soc_camera_host, v4l2_dev);
 }
 
-static inline struct soc_camera_link *to_soc_camera_link(struct soc_camera_device *icd)
+static inline struct soc_camera_link *to_soc_camera_link(
+       const struct soc_camera_device *icd)
 {
        return icd->dev.platform_data;
 }
 
-static inline struct device *to_soc_camera_control(struct soc_camera_device *icd)
+static inline struct device *to_soc_camera_control(
+       const struct soc_camera_device *icd)
 {
        return dev_get_drvdata(&icd->dev);
 }
 
+static inline struct v4l2_subdev *soc_camera_to_subdev(
+       const struct soc_camera_device *icd)
+{
+       struct device *control = to_soc_camera_control(icd);
+       return dev_get_drvdata(control);
+}
+
 int soc_camera_host_register(struct soc_camera_host *ici);
 void soc_camera_host_unregister(struct soc_camera_host *ici);
 
@@ -176,14 +194,8 @@ struct soc_camera_format_xlate {
 struct soc_camera_ops {
        int (*suspend)(struct soc_camera_device *, pm_message_t state);
        int (*resume)(struct soc_camera_device *);
-       int (*init)(struct soc_camera_device *);
-       int (*release)(struct soc_camera_device *);
-       int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *);
        unsigned long (*query_bus_param)(struct soc_camera_device *);
        int (*set_bus_param)(struct soc_camera_device *, unsigned long);
-       int (*get_chip_id)(struct soc_camera_device *,
-                          struct v4l2_dbg_chip_ident *);
-       int (*set_std)(struct soc_camera_device *, v4l2_std_id *);
        int (*enum_input)(struct soc_camera_device *, struct v4l2_input *);
        const struct v4l2_queryctrl *controls;
        int num_controls;
@@ -266,6 +278,21 @@ static inline unsigned long soc_camera_bus_param_compatible(
                common_flags;
 }
 
+static inline void soc_camera_limit_side(unsigned int *start,
+               unsigned int *length, unsigned int start_min,
+               unsigned int length_min, unsigned int length_max)
+{
+       if (*length < length_min)
+               *length = length_min;
+       else if (*length > length_max)
+               *length = length_max;
+
+       if (*start < start_min)
+               *start = start_min;
+       else if (*start > start_min + length_max - *length)
+               *start = start_min + length_max - *length;
+}
+
 extern unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,
                                                   unsigned long flags);